tree 9e3a0db11bbee6b8acf2c0bbfa243d99bd6ba99e
parent 1e262f67e81ebbb0ed33a812e0ba377f495b7e0b
parent a34b8c207b6418b5aab8c7ec304952d991ec522e
author Tatu Saloranta <tatu.saloranta@iki.fi> 1459819098 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1459819098 -0700

Merge branch '2.6' into 2.7

Conflicts:
	release-notes/VERSION