Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:11:45 +0000 (18:11 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:11:45 +0000 (18:11 +0200)
commit986fa607a171075c25bd7b3b860fbaa2fafd398a
tree68a6e4cdefd815b30c8c8f5f6925077c8f06d7d3
parentbd62339074d5fe087ad6c5ee9507ca50793a03b8
parentfb932a967b093e5a7dd9c21b7fa058729890e542
Merge 0.10->trunk