Fix bad merge from 'master' into 'next'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 5 Oct 2019 11:31:30 +0000 (13:31 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 5 Oct 2019 11:31:30 +0000 (13:31 +0200)
commit0d5a2f63a7dc33fc2a91134a092047ba5a23f612
tree51f55b5f30d958b8b290eff87b4ee649540fbfe1
parent83a95bf9028921a8050354f6b1e323867db520db
parentf865c3df7afb4686b9c5a11174a49516808d250c
Fix bad merge from 'master' into 'next'

See 130249b90b243f0757d1b99cb1422590d63d4838