Andy Wilkinson 3c35066ed5 Merge branch '1.5.x'

2017-01-13 15:40:53 -05:00

..

java/org/springframework/boot/autoconfigure

Merge branch '1.5.x'

2017-01-13 15:40:53 -05:00

resources/META-INF

Merge branch '1.5.x'

2017-01-06 12:45:20 +01:00