From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 18 Sep 2017 00:56:13 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: production~42
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;ds=inline;h=070d28b52b712a9067c29e6a358d39d2c3816048;hp=--cc;p=lantea.git

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

070d28b52b712a9067c29e6a358d39d2c3816048