From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Fri, 23 May 2014 17:53:39 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: producution~29
X-Git-Url: https://git-public.kairo.at//?p=lantea.git;a=commitdiff_plain;h=dbeed1023c56a71967c364b871756c56fc2502e8

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

dbeed1023c56a71967c364b871756c56fc2502e8