Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 19 Feb 2014 19:10:23 +0000 (20:10 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 19 Feb 2014 19:10:23 +0000 (20:10 +0100)
commit17726d2e4d76305affaa12e5caf57101693395e7
treebb908c103bc8032b02ffc3a9fc8f44ff1fd35703
parent617cf36f035b98cdcfc1f933cf8946bf26e53274
parent6559784045c0c805926f1709b54efa514d3fb696
Merge 0.10->trunk