Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 22 Feb 2016 14:24:20 +0000 (15:24 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 22 Feb 2016 14:24:20 +0000 (15:24 +0100)
commit1a4ea53929907a8ce0e2c705dae1984eff36d3dc
tree1ce5502307d778d1a8b8d2190ed7329f85bda0df
parenta98b54295f323341d35a61e35a3d381f36ecb0ec
parentab7d97dfd6d1a5be144b9ebff5bc05fd65dc9ffe
Merge 0.10->trunk