Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 23 Nov 2012 00:51:53 +0000 (01:51 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 23 Nov 2012 00:51:53 +0000 (01:51 +0100)
commiteccbcb3ea2047f1507510fce0ad8ad032f432fed
treefd62c77c131844e7ebc3eda4c8140293ce39e453
parentbb541b9949f3499b313619a9e9abf1552cc3c283
parent4178e7035604431f9a1513dfe2c46abbc0544d7e
Merge 0.9->trunk