Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 17 Sep 2015 20:15:26 +0000 (22:15 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 17 Sep 2015 20:15:26 +0000 (22:15 +0200)
commitb929cdacbd94eb60aa190206beb5dbf917255df7
tree1d896fb78756984fff43939da52155f38c4af85a
parent50096c75784ec2f86ddaa433bf773171d7ea0b8e
parent453b4321346b051622966ae1202ff944bc780bd7
Merge 0.10->trunk