From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 7 Apr 2016 11:59:33 +0000 (+0200)
Subject: Merge commit '0176ca7cda25ad88e9faa116ffa139ca926de273' into HEAD
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=6e23ad9bc75d6cb2aa86cb36654a6ef44a167011

Merge commit '0176ca7cda25ad88e9faa116ffa139ca926de273' into HEAD
---

6e23ad9bc75d6cb2aa86cb36654a6ef44a167011