Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 15 Apr 2016 11:39:56 +0000 (13:39 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 15 Apr 2016 11:39:56 +0000 (13:39 +0200)
commit27ea87ad73b8080008253b93d8cf8919632a466f
tree561b9b14e18fb9688df82353bbf4c746290133b1
parentc58d749fd8c8abaeecaff9acb4a322b23810907f
parent464233bca26f57449658b8aba4e87a7fdb4c11ac
Merge 0.10->trunk