From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 17 Dec 2012 23:02:28 +0000 (+0100)
Subject: Merge branch 'master' of github.com:KaiRo-at/lantea
X-Git-Tag: legacy-preGL~40
X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=commitdiff_plain;h=4040eb820dbde99bf35ddebf05720c7582a2ad48;hp=-c

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

4040eb820dbde99bf35ddebf05720c7582a2ad48