Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 22 Aug 2015 19:01:00 +0000 (21:01 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 22 Aug 2015 19:01:00 +0000 (21:01 +0200)
commit12b457bd8dc0f23e9e51c65858925ee30368d571
tree7f816f5496e976643ce327325a3d86eb3d5ae4ca
parent3de45a688611ac2b1fe9136a982550fb00ccdb4a
parent5cadbffeff252cf629b185032959dc27d0c8429f
Merge 0.10->trunk