tree aa6d03b89926e7d7257628c25c6b85d70ec8dd72
parent 1fb1e2715d56e633660ffe4733a7a868e6b7b531
parent 25e7dd0dadca8b419a12e27a82deace1292c5cd3
author Tatu Saloranta <tatu.saloranta@iki.fi> 1457563515 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1457563515 -0800

Merge branch '2.5' into 2.6