Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 21 Feb 2016 15:54:56 +0000 (16:54 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 21 Feb 2016 15:54:56 +0000 (16:54 +0100)
commita98b54295f323341d35a61e35a3d381f36ecb0ec
tree91b52640a80b326984a7c82ce9bfd36a82eb7639
parentbe38f07c4412834754783950074e72841ebc9eb4
parentcf1ee8e07f28c596ae133b06db758bef30622eaa
Merge 0.10->trunk