Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 22 Feb 2016 17:46:59 +0000 (18:46 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 22 Feb 2016 17:46:59 +0000 (18:46 +0100)
commit64a429222baa79fa17f87dbc90c7738c5caabb73
tree51d00622ef4dfc2ac235f01a48edbbe7941b58ce
parent1a4ea53929907a8ce0e2c705dae1984eff36d3dc
parentc3f3acacfdc8864800435bb6ebff61a04a5a575b
Merge 0.10->trunk