Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Tue, 3 Sep 2013 11:43:39 +0000 (13:43 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 3 Sep 2013 11:43:39 +0000 (13:43 +0200)
commit0ae741529413e2f621d1be47c6c479c58416f1c1
tree5c5da73df407493e6bbda275431e3550b8a4ac51
parent86fe40ab240228bb6653638c8dea2c47aee043e1
parent71e249fa42f14d24769961b78bc99a80e0e8684a
Merge 0.9->trunk