Andy Wilkinson 2ca5e8e5d6 Merge branch '1.1.x'

2014-07-21 11:40:26 +01:00

..

src/main

Merge branch '1.1.x'

2014-07-21 11:40:26 +01:00

pom.xml

Switch master to 1.2.0.BUILD-SNAPSHOT

2014-07-11 10:44:05 +02:00