From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 21 Jun 2014 14:45:33 +0000 (+0200)
Subject: Merge branch 'template'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=7e979cc57595d265f750ac2076a34a3565b1197d;hp=-c

Merge branch 'template'
---

7e979cc57595d265f750ac2076a34a3565b1197d