Stephane Nicoll 89aba8b3d8 Merge branch '1.2.x'

2015-11-26 16:59:12 +01:00

..

src/main/resources

Fix inconsistencies between pom.xml and META-INF/spring.provides

2014-03-22 13:51:18 +00:00

pom.xml

Merge branch '1.2.x'

2015-11-26 16:59:12 +01:00