From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 18 Aug 2014 00:22:30 +0000 (+0200)
Subject: Merge branch 'master' of github.com:KaiRo-at/lantea
X-Git-Tag: producution~27
X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=commitdiff_plain;h=0ff45a551df5cc4624119ec7203f461f3e680cf8

Merge branch 'master' of github.com:KaiRo-at/lantea
---

0ff45a551df5cc4624119ec7203f461f3e680cf8