Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jun 2018 08:55:41 +0000 (10:55 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jun 2018 08:55:41 +0000 (10:55 +0200)
commit8e9a18b3d5f0dee47467ce6044c857b000e66371
tree2d06a81bb24e69c980812afcf7f6c12eb5a2eac9
parentafbd3fb6c2fbf68b63627c3b3d5b2afdfdfc2387
parent2f6ccf8302cf36a1a564a9bc6ca3a90a164e61f8
Merge branch '3.0'