Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Wed, 17 Apr 2013 17:11:57 +0000 (19:11 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 17 Apr 2013 17:11:57 +0000 (19:11 +0200)
commitc4d2cdb82ad0c54e36c36c8a346d622aa8a4bb87
tree8aba86913a6593357169e74a8790901fe85fc5ea
parente5747f9ccd8b2829a09bf9c781a9c8f965c466a5
parent0bbffbb1a092a3e95ed7c229afc6ee00aec0ee5d
Merge 0.9->trunk