tree 28b5188cd04a4cfa13d7a0eddc46c85f434f5209
parent f55df17dd367898d5366d858878f786ff4f797d8
parent c32637998fc3f1a04345d2334596eb594c905c26
author Tatu Saloranta <tatu.saloranta@iki.fi> 1457745197 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1457745197 -0800

Merge branch '2.7'