Andy Wilkinson da90e5bc6b Merge branch '1.1.x'

2014-10-01 16:24:16 +01:00

..

src/main

Merge branch '1.1.x'

2014-10-01 16:24:16 +01:00

pom.xml

Merge branch '1.1.x'

2014-10-01 14:29:19 +01:00