updated version
[maven-release-plugin] prepare release khs-sherpa-1.2.0
updated pom
[maven-release-plugin] prepare release khs-sherpa-1.2.0
update pom
[maven-release-plugin] prepare release khs-sherpa-1.2.0
version update
[maven-release-plugin] prepare release khs-sherpa-1.2.0
update
update
update
[maven-release-plugin] prepare release khs-sherpa-1.2.0
[maven-release-plugin] prepare for next development iteration
newMerge branch 'master' of https://github.com/in-the-keyhole/khs-sherpa.git

Conflicts:
	pom.xml