Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 30 Jan 2016 13:18:42 +0000 (14:18 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 30 Jan 2016 13:18:42 +0000 (14:18 +0100)
commita81725f764e9fb73f50008e65b75cdfecbc6d0e3
tree40a90443d09d782f1e7360060201cd138bd4bd52
parentd9ea1730ed8f0e91fc94fa3d52a18d8434df988f
parent546c1a3b148e366b2b1434dccdf3a7d827156f8b
Merge 0.10->trunk
CHANGES