Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-04-21 15:16:26 +01:00
commit 73e7f1eec0

View File

@ -23,7 +23,6 @@
<json.version>20140107</json.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<json.version>20140107</json.version>
<maven.version>3.1.1</maven.version>
</properties>
<prerequisites>