Dave Syer 1a317a5ac9 Merge branch '1.0.x' ...

t message to explain why this merge is necessary,

2015-08-25 15:22:26 +01:00

..

src/main

Merge branch '1.0.x'

2015-08-25 15:22:26 +01:00

pom.xml

Update to Brixton

2015-06-26 12:57:05 +01:00