Phillip Webb 7227c0df5f Merge branch '1.0.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-05-15 15:09:24 +01:00

..

pom.xml

Merge branch '1.0.x'

2014-05-15 15:09:24 +01:00