Stephane Nicoll 9f010ed8c0 Merge branch '1.2.x'

2015-05-26 15:01:13 +02:00

..

src/main

Merge branch '1.2.x'

2015-05-26 15:01:13 +02:00

pom.xml

Fix build

2015-05-26 11:07:24 +02:00