tree 4cc950f97fdb7a21a1ccd68a8cbfc28d78fac196
parent a981a114ac38139cb78fb8a50cd8617b70d1d530
parent 1fb1e2715d56e633660ffe4733a7a868e6b7b531
author Tatu Saloranta <tatu.saloranta@iki.fi> 1453780915 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1453780915 -0800

Merge branch '2.6'

Conflicts:
	pom.xml
	release-notes/VERSION