Phillip Webb 3328c1369f Merge branch '1.1.x' ...

Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java

2015-02-01 20:28:11 -08:00

..

it

Polish

2015-02-01 20:00:11 -08:00

main/java/org/springframework/boot/loader

Merge branch '1.1.x'

2015-02-01 20:28:11 -08:00

test

Polish

2014-11-11 09:47:54 -08:00