Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <kairo@kairo.at>
Fri, 10 Nov 2017 20:19:23 +0000 (21:19 +0100)
committerRobert Kaiser <kairo@kairo.at>
Fri, 10 Nov 2017 20:19:23 +0000 (21:19 +0100)

Trivial merge