Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 5 Apr 2015 13:22:33 +0000 (15:22 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 5 Apr 2015 13:22:33 +0000 (15:22 +0200)
commitcb6de69fcb80bd64d5ff2e7048bdf17721f776bf
tree5402b5a3cf4a33f61804e9c02a9e096dfdba47b7
parent68a1d3cefc951c999be57532eff3192521c9c2d5
parent727e3262574aef7b58e2de7ecfe9a462d601c019
Merge 0.10->trunk