Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 22 May 2016 12:39:20 +0000 (14:39 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 22 May 2016 12:39:20 +0000 (14:39 +0200)
commit670c0bb01015bf63176eafc5c605c800c7053e1f
tree2a0c42692ace4f6885e69a61e7e63a840ef3f6d6
parentba884557ec95b3720a68b962756e289b82bf15c5
parent655f2d8751825c83db59c4f8370b724c03b8c310
Merge 0.10->trunk