Merge 0.10 -> trunk
authorKim Alvefur <zash@zash.se>
Wed, 12 Feb 2014 18:26:54 +0000 (19:26 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 12 Feb 2014 18:26:54 +0000 (19:26 +0100)
commit6559784045c0c805926f1709b54efa514d3fb696
tree514f0dbf83d12b14864e25c135a56eaf960741ac
parentcd4302a2db387ed852a06cb997e6424d61ca5419
parent1d8c974f6b89a81ee1416eb5be9fcf104cfaf99e
Merge 0.10 -> trunk