Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Mon, 7 May 2018 17:18:39 +0000 (19:18 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 7 May 2018 17:18:39 +0000 (19:18 +0200)
commit31ce467b21d0053b1f7a944a0caf4d4fd5389310
tree8f5434ec266f1315d2a8b3c1bee11146fe23a73e
parent81382755a6ac717728e4ae493b3c45dd65f8b174
parent33c2b55bb639ffd78609cc4b64858b1828b9f4e8
Merge branch '3.0'