From: Christoph Egger <christoph@christoph-egger.org>
Date: Sun, 28 Aug 2016 13:40:16 +0000 (+0200)
Subject: Merge git.siccegge.de:talk/template/privat
X-Git-Url: https://git.siccegge.de//index.cgi?p=talk%2Foop.git;a=commitdiff_plain;h=130bcf7ae29c01fcd7695fa1ae92de5ddc3e53e2

Merge git.siccegge.de:talk/template/privat
---

130bcf7ae29c01fcd7695fa1ae92de5ddc3e53e2