tree 6606d85c3e2d3be615a7393fd88a7ed241af03ba
parent 3e08b4076cebe7f39db9385937e260b94972e783
parent a1f21192671fbc943d6f5db13bce0a729bc5bb60
author Tatu Saloranta <tatu.saloranta@iki.fi> 1415291177 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1415291177 -0800

Merge branch '2.4'

Conflicts:
	pom.xml
	release-notes/VERSION