Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 18:09:37 +0000 (19:09 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 18:09:37 +0000 (19:09 +0100)
commitb3f6d1b83aab2ce0c98be708937fda1f27b9d73f
tree0e01ee71a069e677aa06bf751726cb2a9aee4bd5
parent3c561ed7ab90acb90ea8cec61d912586b91fe56b
parent9a14d84f38e413534de56087e2a371a11b854e85
Merge 0.10->trunk