Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 22 Apr 2014 22:23:46 +0000 (00:23 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 22 Apr 2014 22:23:46 +0000 (00:23 +0200)
commitd5e2d086135f4a055aff601f578c4fd80d10000b
tree52206a1d903d733d3ec80be09ca303b8156f25e5
parent5f54e7ab748331962bdcf6c1dd0a6cb475149b64
parent2812d8d444f3408276eba8108b2535a5446e82b3
Merge 0.10->trunk