tree badd4fa636d166adbb05139c5622ccef05722b95
parent 5261db0ae15b65616ba50cfe8eadf06fe63125f8
parent 3c61041576136bb6a855d26434adc7bb09f50199
author Cowtowncoder <tatu.saloranta@iki.fi> 1429895241 -0700
committer Cowtowncoder <tatu.saloranta@iki.fi> 1429895241 -0700

Merge branch '2.5'

Conflicts:
	pom.xml