Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:48:32 +0000 (23:48 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:48:32 +0000 (23:48 +0100)
commit14478740f32344bae761f71f07e14d6ebbef9bc3
treea043ba83d57c04d78676308821119dc9c1af924e
parentfea2a20a1c12fe7415426658e55095fee94fe656
parentf6894d7e9d7f13b206f9c3d6fb1bb232a1b625d5
Merge 0.10->trunk