Merge branch '1.2.x'

This commit is contained in:
Phillip Webb
2015-10-07 23:19:50 -07:00
30 changed files with 451 additions and 375 deletions

View File

@@ -17,7 +17,6 @@
<url>http://www.spring.io</url>
</organization>
<properties>
<java.version>1.7</java.version>
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<dependencies>