Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 21 Mar 2016 13:52:43 +0000 (14:52 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 21 Mar 2016 13:52:43 +0000 (14:52 +0100)
commit9c85fcb7b572a271520fcca37e381445326d1251
tree4dbbd6e8376ccaa83b251b03d6648d7eac8f7485
parent8ea5e2a658bb1755cd7f234231e9d030e1762d3b
parentc7381b259c35e4c093b32da12b18e63d7108e83a
Merge 0.10->trunk