tree a811e768f9574f40d9c0dd5d2886dcb651597bc3
parent a8029027e5d41fe2061c40b9bf0c92862f050689
parent 19ef2d3a78af2525cebc616b234c4b28a3d9e316
author Dave Beech <dave@paraliatech.com> 1363209077 +0000
committer Dave Beech <dave@paraliatech.com> 1363209077 +0000

Merge branch 'trunk' into mrunit-1.0

Conflicts:
	pom.xml