From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 20 Nov 2017 18:26:17 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: production~22
X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=commitdiff_plain;h=c53a1969fd519687ca4d581077c8dc3792169bb8

Merge branch 'master' of linz:/srv/git/lantea
---

c53a1969fd519687ca4d581077c8dc3792169bb8