Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jun 2018 08:55:52 +0000 (10:55 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jun 2018 08:55:52 +0000 (10:55 +0200)
commit2e768ae9339c0385df736916475f5a93bc28ff35
treea1c57b54e9899026beadee347ac92dbf7e2b7669
parent5d78dfe8f9af68fc113c0b946e9e37ec144748bb
parent8e9a18b3d5f0dee47467ce6044c857b000e66371
Merge branch 'master' into next