spring-boot/spring-boot-docs
Phillip Webb af643e2f54 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
2014-12-05 10:25:30 -08:00
..
src/main Merge branch '1.1.x' 2014-12-05 10:25:30 -08:00
pom.xml Next development version 2014-11-11 17:12:24 -08:00