Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 2 Oct 2015 10:13:32 +0000 (12:13 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 2 Oct 2015 10:13:32 +0000 (12:13 +0200)
commit08e851116a2469b9e5d931b6fdad959a233126d4
tree572ed54a76feed1ae2afa03701898ccebd47f785
parenta1ed1a77599a0220cde0f44e516ce191b5e2f309
parent190760baa6ef113efd61425627baa0b3e9f5f7cf
Merge 0.10->trunk