Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 6 Dec 2015 01:43:01 +0000 (02:43 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 6 Dec 2015 01:43:01 +0000 (02:43 +0100)
commit71f987d510a0cc942ae4f8de272e93ba871d28ad
tree19ab94ca3709af4a7a503b0f55dedd8cf257d655
parentb55fa49597115150b2c5325f041a845cda894c98
parenta9b901623e44c84e130b1f4cb21ac4e245daf141
Merge 0.10->trunk