Andy Wilkinson 84edf0167f Merge branch '1.4.x' into 1.5.x

2017-01-19 15:27:45 +00:00

..

main/java/org/springframework/boot/junit/runner

Merge branch '1.4.x' into 1.5.x

2017-01-19 15:27:45 +00:00

test/java/org/springframework/boot/junit/runner/classpath

Merge branch '1.4.x' into 1.5.x

2017-01-19 15:27:45 +00:00