tree e3d28c5b10cc7e87a86b1f001d052fc1a2ea7350
parent b65b3cb2d139c4309a22b31812957808c5c96f47
parent 27d83ee5b296260bd89961cc3e45aa264025c115
author Tatu Saloranta <tatu.saloranta@iki.fi> 1463107744 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1463107744 -0700

Merge branch '2.6' into 2.7

Conflicts:
	release-notes/VERSION