Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 26 Sep 2015 22:37:18 +0000 (00:37 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 26 Sep 2015 22:37:18 +0000 (00:37 +0200)
commita1ed1a77599a0220cde0f44e516ce191b5e2f309
treef0620d8d50d9418bb9e38e1e5c56b4ed28fbe09d
parent986fa607a171075c25bd7b3b860fbaa2fafd398a
parenta14deb1f4521c0dd3a1e062c521ba71c54bafc75
Merge 0.10->trunk