Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 15 Apr 2014 18:36:39 +0000 (20:36 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 15 Apr 2014 18:36:39 +0000 (20:36 +0200)
commit6d6261301364166dfe3f08dd22616d6bbcea024c
treefcfdd62649eb27c69b5d1c9022ecc9009db1c090
parent280435ae3de2e38994b7cd6986465d63071957c1
parentc5aee3e46c69a26c9788898e7e1ef02507463840
Merge 0.10->trunk