Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 10 Sep 2014 23:17:56 +0000 (01:17 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 10 Sep 2014 23:17:56 +0000 (01:17 +0200)
commit87a3b0a616dee174353d472165394acc1a9676ab
treef092b6013129a9795c1b53677130f6908ee5389a
parent300378bf0e60d10ce836f89c6d37e7494e00577d
parentd4310906571a270aeca102ce31ef9ce147c39388
Merge 0.10->trunk