Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 26 Mar 2016 13:54:39 +0000 (14:54 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 26 Mar 2016 13:54:39 +0000 (14:54 +0100)
commit41e88b680832d0331d3759bc72a777fb6355d781
tree0a181ca05efe4922eddd1cc39c672f530503da4f
parent237fa41417a18f17c288b2a45efe60579717550e
parent2b21d9f35c69083c05ac5cfb2931c5aa0877b41f
Merge 0.10->trunk