Merge branch '2.1' into 3.0
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:34:41 +0000 (13:34 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:34:41 +0000 (13:34 +0100)
commit2a1b16b117c2cacbbcff25f4990f466d0652e455
tree5551e1a66845a34b433989058101bc36ad87c98c
parent99b1ca4545c4ac4d030fecdbe653f2268cd582b1
parent1a9a7ba34e1cfa1fafbe53d2efe889389ce34010
Merge branch '2.1' into 3.0