Merge branch '2.0' into 2.1 2.1.final
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:29:59 +0000 (13:29 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:29:59 +0000 (13:29 +0100)
commit3145f1ddc5079fd0c230d61fbe015e785a14a1fc
tree8e385e570d621eb41eefda4371e80fc18bcfa8b0
parentcd1eee99f8edf88abf8ea164cc9427d8f4714927
parentbfcb70a8887dd0424bb7f07dab3f90dc2c518e32
Merge branch '2.0' into 2.1