Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 28 Jan 2016 14:11:33 +0000 (15:11 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 28 Jan 2016 14:11:33 +0000 (15:11 +0100)
commit5229647a989031814ad838005179f7facf198f44
tree7992cd4791e610d34c74ac4d8b7fb0aea92f7691
parentb244d865c10f013995fa3615cd9ddc019c352d55
parentb62a920781ff0d209b29c785fc594bbc9a0c9522
Merge 0.10->trunk