Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 11 Aug 2015 08:29:25 +0000 (10:29 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 11 Aug 2015 08:29:25 +0000 (10:29 +0200)
commit07e26ffcf6362e9bcf3c8ba71cce19a1fe629c2b
treea82e9563cb1d167a44f3164ff1edb118db34bf1b
parent956f540c39740cbc7c6f3d0653e6038537f0e76b
parenteb667887d3e88dca83c75c485654e9e74e60d5ee
Merge 0.10->trunk