Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 17:08:44 +0000 (18:08 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 17:08:44 +0000 (18:08 +0100)
commit826ddbb2bf34f2c8eb358bc6d2285a937055d714
treee7e88dcee2d1017be11035cd02461759538a9ef9
parent52bfab3d45dc0ecf9d779c53d75de921cfe13020
parent6bdc1a27913908e420040adf33a3c9bb779d992f
Merge 0.10->trunk