Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:34:55 +0000 (13:34 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:34:55 +0000 (13:34 +0100)
commit936f4be88a743692e862ebe25d781ccd48e704e3
treec92b6b22d5d30d4a99d426cc87b08fd25f225cab
parentf535a37f7923fff000e37857b81554d5f5e43cdc
parent2a1b16b117c2cacbbcff25f4990f466d0652e455
Merge branch '3.0'