From: Felix Dörre <felix@dogcraft.de>
Date: Sun, 1 Feb 2015 01:46:44 +0000 (+0100)
Subject: Merge branch 'felix-work'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=a1a980dd0cc65f33a6189eb81a164fe79abb647c

Merge branch 'felix-work'
---

a1a980dd0cc65f33a6189eb81a164fe79abb647c