Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 9 Nov 2015 21:56:32 +0000 (22:56 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 9 Nov 2015 21:56:32 +0000 (22:56 +0100)
commit979e1e44aced6150462a31e99e245aea5f81c42a
treef305a473fc414b63f2f88e46f3f83cafddede47a
parentc23a5dc49a5c5d248d141cd2cc883c9ea4b10cc7
parentb861c8d03f659257f89dbac247cd5ca1a8f861a4
Merge 0.10->trunk