Phillip Webb 12907e6b1b Merge branch '1.0.x' ...

Conflicts:
	spring-boot-starters/spring-boot-starter-parent/pom.xml

2014-04-25 14:03:14 +01:00

..

pom.xml

Merge branch '1.0.x'

2014-04-25 14:03:14 +01:00