Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Wed, 31 Jul 2019 16:05:36 +0000 (18:05 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 31 Jul 2019 16:05:36 +0000 (18:05 +0200)
commitc05697a9edaaee4a54fa21b4cb9af7a7846413ae
tree0e1830015f5c5cc64eab680fe4529bff62ec2298
parent302a78be4d7a330cc921bfeeb70c5e97c06a1b1f
parentff5a7a247ad850cc0ddce419cb7222a8ce81c18c
Merge branch 'master' into next