Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 26 Mar 2015 23:29:35 +0000 (00:29 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 26 Mar 2015 23:29:35 +0000 (00:29 +0100)
commit31af2a40fd46ca61fe07719911af8ee96f6858e2
tree8b88a09d752120ae090d2182c6fa34e6b4fba0b9
parent7890be75b007fb3849e2ee4659cf8960bcb7ecd9
parentfd16de241bcf6b14d878258815ffed3e6f92a0e8
Merge 0.10->trunk