Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 5 Apr 2016 10:48:36 +0000 (12:48 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 5 Apr 2016 10:48:36 +0000 (12:48 +0200)
commit92dda9fa87f88da2a374ed3ad3feca16d603f360
tree564d6656260f44d30a705c1f91fd49520f27d6f3
parentdd1c2bfbf0917191707327d9cc5dccf85cd5d0aa
parent082b297a32b7c9afdc616cdc45fdae21b4f27e7c
Merge 0.10->trunk