tree c9e9529146bb22d36dbbfed74115413069be7082
parent 6778052d7c8ffd45f26fb443353bed018c923244
parent ec5756671e5692db95caa4e46f978e3bcd3ccbff
author Kenneth Chan <kenneth@tappingstone.com> 1378337612 -0700
committer Kenneth Chan <kenneth@tappingstone.com> 1378337612 -0700

Merge tag 'v0.6.0-develop'

[maven-release-plugin]  copy for tag v0.6.0-develop

Conflicts:
	README.md
	examples/import/pom.xml
	examples/import_deprecated/pom.xml
	examples/simpletasks1/pom.xml
	examples/simpletasks1_deprecated/pom.xml