Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 20 Jan 2016 13:46:27 +0000 (14:46 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 20 Jan 2016 13:46:27 +0000 (14:46 +0100)
commitbdcf3ced016d18a039cb42a1db6e60195ca8676e
treee00f305c750771048f31c4d62ab53cd1db14e38c
parent6481c65ce2831cb761818fa219964c076828bd53
parentc9ce85a5d7575f9c55ce85b45db812f3e8392b07
Merge 0.10->trunk