Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 8 Apr 2016 15:54:50 +0000 (17:54 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 8 Apr 2016 15:54:50 +0000 (17:54 +0200)
commit5707e0f89786a863f75904de86c81063e791c341
tree5635b84f9b4a9c42acb7f17e8ad35406a3a263dc
parent585a239ff040bbe33b2d4e43dff8ea83fa742dcf
parentdab6d728cdf433df8c7c22dac65b8c920f16d5af
Merge 0.10->trunk