tree ff44e0b824b2e62f0b683366c06239d48213eace
parent 82837cc106559bb496e16ba792f216bcb692554c
parent 308ed4ed89b32d119b5994e457597275c6a0af7d
author Tatu Saloranta <tatu.saloranta@iki.fi> 1454135687 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1454135687 -0800

Merge branch '2.6'