Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 20 Apr 2014 21:39:45 +0000 (23:39 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 20 Apr 2014 21:39:45 +0000 (23:39 +0200)
commitdb670c1161f28a7a0d1d7d55c35088bde8d5d1c1
tree1bace12bf13aec6bb027e1edb2599bbdcd9666ca
parentbed84ba3b6cd0ea823a6c086a4df6f9837e3c370
parentbeb85c3967fd49f0a7b8c9514e537d35785d6850
Merge 0.10->trunk