Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 12 Dec 2015 01:33:15 +0000 (02:33 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 12 Dec 2015 01:33:15 +0000 (02:33 +0100)
commit8f9244c94ff4b31c215119b3cc35fac430634589
treee9072f98f30ad1b03e3e993736df8c24abced123
parent6d25b160589866fbb561f350c812205faa169f71
parent37b446c30699da2aaf7f8aa6e49aa12db9dcffa9
Merge 0.10->trunk