From: Robert Kaiser <kairo@kairo.at>
Date: Fri, 28 Nov 2014 20:51:05 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/themes
X-Git-Tag: LCARStrek-2.31~6
X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=42f880d7999a96ab6998882d52ab5b0113a23285;hp=42f880d7999a96ab6998882d52ab5b0113a23285

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