Phillip Webb 565e449d89 Merge branch '1.1.x' ...

Conflicts:
	spring-boot-docs/src/main/asciidoc/howto.adoc

2014-09-15 11:37:50 -07:00

..

src/main

Merge branch '1.1.x'

2014-09-15 11:37:50 -07:00

pom.xml

Next development version

2014-09-04 12:15:18 -07:00