Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 6 Oct 2013 21:53:15 +0000 (23:53 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 6 Oct 2013 21:53:15 +0000 (23:53 +0200)
commit6d31e17198883bb1f24c18cf2a0a52b4279b78f1
tree9ef3d1ed9afa2449a2060ca8609071182ff4201e
parenta9c890b795c6736f90272eadb476e109c94c448f
parent4b02876f1aeda9ea4264e49fdb3f990265ec86ed
Merge 0.10->trunk