Merge 0.9 -> trunk
authorKim Alvefur <zash@zash.se>
Sun, 14 Oct 2012 20:53:41 +0000 (22:53 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 14 Oct 2012 20:53:41 +0000 (22:53 +0200)
commit432f7bcb7852e2c59e98b5a3eb83365931e4d2d4
treec9ef547fcba89f160458d4301391eb79ba834d5b
parente95400712490b988628cd84c273759954613acea
parent52bea09c8103241e7d8625bd2f4a2098e5ec6419
Merge 0.9 -> trunk