Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 19:05:56 +0000 (20:05 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 19:05:56 +0000 (20:05 +0100)
commit58f1457853b894cde50f7a731431cec0aa9c6e20
tree4322e675d421a6349d70551905eb53e1196bf41f
parenta243bf2c3e71340c72be7a2910fd2f60a08bd521
parent5717e84607e1eddedbc8e61edef47cee9203e126
Merge 0.10->trunk