Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 14:06:56 +0000 (15:06 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 14:06:56 +0000 (15:06 +0100)
commitdf4d9d12f4ed5f9bb1341928005ad2f57cb0deb4
tree1587e60606f7859c35a5a2a9dc95e72869c76342
parent88b9f0b33cf2c6d3d77af973d80ce20556a9265b
parentef81df8c435cc4b42cc47fa735dd863f56da880c
Merge 0.10->trunk