Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 29 Mar 2016 13:38:14 +0000 (15:38 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 29 Mar 2016 13:38:14 +0000 (15:38 +0200)
commit3a95d35cc1d8aa304260229bc70cca5a6458ade7
tree0fb938b2958d21f3eb446b55c05439e763382510
parentb894a262724d2912d61f2499aba6b134d572ae47
parentdf5e40b0ca9b70e1e6e74ebadf7505fc5df0bc6a
Merge 0.10->trunk