tree 74f976cfc527422851b359b2f3f20bba2af3399a
parent 7b5f4aa15d17d18031b4171877abf7e3fded2d33
parent 110c1a1bb94dce3b054aeaba993d40817289e58d
author Tatu Saloranta <tatu.saloranta@iki.fi> 1457563573 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1457563573 -0800

Merge branch '2.6' into 2.7