Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 01:13:03 +0000 (02:13 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 01:13:03 +0000 (02:13 +0100)
commit6c366a251aff03c7f25d703fca23110726411272
treea0b6736c9e59af1d086a111f999e7b6a3cfaf4ec
parentc3eb08a4cf1173512900c210588f403427946503
parent3f43b54eda5e759ec43349837c231ba6b44785e4
Merge 0.10->trunk