Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 26 Jan 2015 14:27:19 +0000 (15:27 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 26 Jan 2015 14:27:19 +0000 (15:27 +0100)
commit61c8aba34e98085ae9daf50c80fb08fc5015c427
tree530528cb609d700d0f080051731809d5d4a2daaa
parenta030bbf6840a1b0d229b462805561125c34ebdb5
parent38e539bc0be80a3b6a784e06c9b33e347f9524fa
Merge 0.10->trunk