Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sun, 3 Feb 2013 14:52:27 +0000 (15:52 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 3 Feb 2013 14:52:27 +0000 (15:52 +0100)
commitbf3ecf9003fca3f1cc218622ac5f385dd45aecb8
treef6da5bf24c12626ca86ad63ff3c5b379b7a18c95
parent6b40a91a2d8f894c8bbe6d6c9f4fc07f1872c9b1
parent1137daf303ac8d7316f212c1b551d2ac4c0a8cf7
Merge 0.9->trunk