From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 7 Mar 2016 01:24:00 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: production~50
X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=commitdiff_plain;h=7b45b392492e0cb54d75b069cfecbb3985b641bc

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

7b45b392492e0cb54d75b069cfecbb3985b641bc