tree 57e0ef2e80ba73ec9de59b3fc1f20d0c3f175a1c
parent 7487cf7eb14be2f65a1eb108e8629c07ef45e0a1
parent 726cbf9eee0835c71a99d7ddf1515f1dba91d9e7
author Tatu Saloranta <tatu.saloranta@iki.fi> 1528436752 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1528436752 -0700

Merge branch '2.7' into 2.8