Files
spring-boot/spring-boot
Andy Wilkinson 160bf1ee3f Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml

Closes gh-2366
2015-01-20 11:57:50 +00:00
..
2015-01-20 11:57:50 +00:00
2015-01-07 23:37:07 -08:00