Merge with ce1478a14033c599020e6cea9e7f7e4393564ef8
tree: a341a2cb9aad5624135339c25374542910d53208
  1. src/
  2. .hgignore
  3. AUTHORS
  4. LICENSE.txt
  5. pom.xml