Andy Wilkinson 9da14fe62a Merge branch '1.2.x'

2015-06-22 16:27:27 +01:00

..

src

Merge branch '1.2.x'

2015-06-22 16:27:27 +01:00

pom.xml

Don’t rely on org.json:json being pulled in transitively

2015-06-22 10:46:22 +01:00