merge from 1.1.x
tree: b9ff7fc08e4b295769820e82053ef640b26bb4ba
  1. cli/
  2. core/
  3. doxia-module/
  4. parent/
  5. www/
  6. .gitignore
  7. pom.xml