Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 13 Dec 2015 20:22:26 +0000 (21:22 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 13 Dec 2015 20:22:26 +0000 (21:22 +0100)
commitc86d0082f66bd65fb7bd4e9fc94fac401e256d0f
tree5adb619043f834708c301a7016eddbce8d42c735
parent8f9244c94ff4b31c215119b3cc35fac430634589
parent22f9bfca1ebbe263b648272748197180de863b3b
Merge 0.10->trunk