Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 9 Aug 2013 14:03:48 +0000 (16:03 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 9 Aug 2013 14:03:48 +0000 (16:03 +0200)
commita714a61c9fd0d594d6d781da301d02ba2c20d6ac
tree5d870d55fb180672b4837a25b25aeeee4aca6524
parent83ca7ad10e62a7177d71fb563e9d5d3434b20ab1
parentb4fd032f2708ffad0bab76e281a28135c5b28bb4
Merge 0.9->trunk