Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 5 May 2014 22:37:08 +0000 (00:37 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 5 May 2014 22:37:08 +0000 (00:37 +0200)
commitc680296542b957a42a64b7181151ab74ebaad316
tree11020c66a7f079f0f9db4165e9d31c799d278deb
parent2569be4197c0562e21856e749d46c7e425dbad72
parente6f233991726b10bbeb7b418e1d8bfbee41c1d2c
Merge 0.10->trunk