Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 17:04:43 +0000 (18:04 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 17:04:43 +0000 (18:04 +0100)
commit52bfab3d45dc0ecf9d779c53d75de921cfe13020
treee7e88dcee2d1017be11035cd02461759538a9ef9
parent828e2f55d7b49fd1bcb3b1113bff2840af13b8d9
parent3cd0dbda126b5cd4cbe32729f765231d53ecc2a3
Merge 0.10->trunk