tree 19f1ff4f2563d60a9fb5a0538a41c8fed66339dc
parent 00a29c8f8ee9a41fcf47a631fb668d8f5058d5d8
parent 0f43226570bd7728fa9680665637dcd317e31a54
author Tatu Saloranta <tatu.saloranta@iki.fi> 1462554419 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1462554419 -0700

Merge branch '2.6' into 2.7