tree 8ce9d6e79210fbdbc398c0e0f0962f348395eed0
parent 8a5b111751006b0d4e1de9fdd99f66e2efbc89cd
parent efc6b982e5070ce396be985a9727a178c477aa47
author Tatu Saloranta <tatu.saloranta@iki.fi> 1475098480 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1475098480 -0700

Merge branch '2.7' into 2.8