tree 1adf91de13ea2dbed86aacc4ad61e31d5fb6574a
parent ad6d3cc4298601577f5c09ee465b118c185262ee
parent 1d39c198f5730c488dba90ae3042232255c060a9
author Tatu Saloranta <tatu.saloranta@iki.fi> 1478233569 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1478233569 -0700

Merge branch '2.8'