Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 24 Mar 2016 12:57:58 +0000 (13:57 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 24 Mar 2016 12:57:58 +0000 (13:57 +0100)
commit237fa41417a18f17c288b2a45efe60579717550e
tree6abcdb5089eb570dbbce994d8ba7704bb859a292
parenteafb468ddf424ee527ab137e088c97d9d553bd92
parent422ec090f0b32d83923fbe600a52f1f590d6fa25
Merge 0.10->trunk