Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 13:54:37 +0000 (15:54 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 13:54:37 +0000 (15:54 +0200)
commit5eed6b1c60e6b9986736b159a5dd3efeca7e0b65
tree1a9a13c2b9768e9cf6412d6f38ba8074bdcb2cb9
parent762427887bb2315dcd34e1e0528d366a10b38e93
parentbd936bfd197b0cc2d01aaafacc4c0606d4d7fd29
Merge 0.9->0.10