tree ede4dd9451435217eea1cfabc0a554d2132ffa78
parent d302ae009a0c4946dce1a7833005e06e58ce1871
parent b338237b6ff25f37949e0020dd4e1350b98ed594
author Tatu Saloranta <tatu.saloranta@iki.fi> 1451975392 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1451975392 -0800

Merge branch '2.6'

Conflicts:
	pom.xml
	release-notes/VERSION