Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 10 Aug 2014 08:31:18 +0000 (10:31 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 10 Aug 2014 08:31:18 +0000 (10:31 +0200)
commitef96f06349d7ab504ab51e4ba44c415d340e13f7
tree4387d658514834bb105915d0f524382a3b8781da
parent7c39cc967d23f7bf2b596ddce27ff54b3fcfa571
parente580e1abadc098156f467f44b62222478ec0e667
Merge 0.10->trunk