Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 14 Mar 2016 16:38:50 +0000 (17:38 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 14 Mar 2016 16:38:50 +0000 (17:38 +0100)
commit1f64492d13899aa45ae94d1a06b4b7c0791b38ae
tree58d939d70bfd2d78b49ba88b60507af6c166fd04
parent0c6805a72d2d213ee0369c965aa06c8caa0ed02a
parent1d6b350593a02276a52485a94b867c0f382e91e4
Merge 0.10->trunk