Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 5 Apr 2015 14:24:10 +0000 (16:24 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 5 Apr 2015 14:24:10 +0000 (16:24 +0200)
commitc5362f4234b8e81649cb84f4d59f6c7f928d8b34
tree246476b9070a12a69e9a812afade6dc91c1bad4b
parentcb6de69fcb80bd64d5ff2e7048bdf17721f776bf
parent5e3542f5992b5fdc6e2b2d09041350294e527802
Merge 0.10->trunk