From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Thu, 3 Jul 2014 19:32:17 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: producution~28
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=64dac5e1fc28b6084393c7e413b271c10cf21cfb;p=lantea.git

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

64dac5e1fc28b6084393c7e413b271c10cf21cfb