From: Robert Kaiser <kairo@kairo.at>
Date: Tue, 11 Sep 2012 15:25:50 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/git-kairo
X-Git-Tag: legacy-preGL~67
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=814b6b2858eea707e5a3977881ec9f62253710a4;p=lantea.git

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

814b6b2858eea707e5a3977881ec9f62253710a4