From: Robert Kaiser <kairo@kairo.at>
Date: Fri, 10 Nov 2017 20:19:23 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: production~22^2~3
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=a1565de42b662fbe8565825aaf2e5619fbb29ac0;p=lantea.git

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

a1565de42b662fbe8565825aaf2e5619fbb29ac0