Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 25 May 2016 19:35:09 +0000 (21:35 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 25 May 2016 19:35:09 +0000 (21:35 +0200)
commit8df2517bf2e7930e32ebf79a11b29206cb30782c
tree9f6cf9d2011de83496ffa98ea5fbc9b5b48aac5d
parentf6f011dfbc3d179c77c0431ffacfaaf091f18053
parentf6d29ba45f7d0ea7338666025319e1b2dd3f25f3
Merge 0.10->trunk