Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 21 Jun 2014 13:05:52 +0000 (15:05 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 21 Jun 2014 13:05:52 +0000 (15:05 +0200)
commit3c64eae6e662e621b8ae9283ebd5ee21120a855a
treecf4ac61efe685560854778d2ebe360fadb078e19
parent1101441e971f0ce1f0ccb61dcb5ed1f6cb453b56
parent73609fc39f973d8b0fcbf3e7298fa6088320a8da
Merge 0.10->trunk