Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 3 Mar 2016 15:06:16 +0000 (16:06 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 3 Mar 2016 15:06:16 +0000 (16:06 +0100)
commitdcaa679b56965b878208f2adababa017b445d739
treebf13f00f80e981afbd52c2d10b4bafaca0121803
parentf77351cc7199f99fb1b21acd30a55213a18fec0d
parent502ba0c0dad3804b9e1ab2992a65bd26175eecfe
Merge 0.10->trunk