From: Christian Heller <c.heller@plomlompom.de>
Date: Fri, 9 Dec 2016 22:34:54 +0000 (+0100)
Subject: Merge branch 'master' of github.com:plomlompom/redo-blog
X-Git-Url: https://plomlompom.com/repos/?p=redo-blog;a=commitdiff_plain;h=7383a96e457507045e84a73ab284f40c55004614

Merge branch 'master' of github.com:plomlompom/redo-blog
---

7383a96e457507045e84a73ab284f40c55004614