Phillip Webb 9cc893cd35 Merge branch '1.1.x' ...

Conflicts:
	spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java

2014-09-04 09:41:58 -07:00

..

src

Apply eclipse formatting rules

2014-09-04 09:39:58 -07:00

pom.xml

Next development version

2014-08-07 11:59:17 -07:00