Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 14 Mar 2016 17:27:32 +0000 (18:27 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 14 Mar 2016 17:27:32 +0000 (18:27 +0100)
commit828e2f55d7b49fd1bcb3b1113bff2840af13b8d9
treee7e88dcee2d1017be11035cd02461759538a9ef9
parent1f64492d13899aa45ae94d1a06b4b7c0791b38ae
parente40db1b46d1e2f7f2216419f7a61bcfcb8a28c9c
Merge 0.10->trunk