Andy Wilkinson 7aaf7c65bd Merge branch '1.1.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-11-11 17:43:17 +00:00

..

pom.xml

Merge branch '1.1.x'

2014-11-11 17:43:17 +00:00