tree 715f2cf9097822c172dcea1bf3e095487aca774c
parent 923e07bdb57c929da59ee62bd32a4c4986bd029e
parent 7b7d529a670a4267c8cb2ce0b3129691a3d83564
author Tatu Saloranta <tatu.saloranta@iki.fi> 1416881007 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1416881007 -0800

Merge branch '2.4'

Conflicts:
	pom.xml
	release-notes/VERSION