Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 29 Jun 2013 20:49:56 +0000 (22:49 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 29 Jun 2013 20:49:56 +0000 (22:49 +0200)
commitecd2e6962f8993af96ffa869659f7949e64054ae
tree6f69f0c2405b1fc27c0166ce3710f0c4c0558841
parentfc20191e79990cd9f393de5f6dfe1b0e5a53cd46
parentc36630d8de110bbe7e237baa7d67ee604147b688
Merge 0.9->trunk