Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 27 Dec 2015 11:29:28 +0000 (12:29 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 27 Dec 2015 11:29:28 +0000 (12:29 +0100)
commit9b53917789f122e1aa8a8dc2eb62c3c5fbd49267
treebd047ebbffc953066ab9ec402bbbac409bebda1b
parentc1c7196071a049b2345c5cd9ecc08511dffefedf
parentd6696f379373a7d797398dc9b20fdf06a2e3ace4
Merge 0.10->trunk