Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)

No differences found