From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 13 Jun 2015 11:39:35 +0000 (+0200)
Subject: Merge branch 'master' of github.com:plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/edit?a=commitdiff_plain;h=1acab9749bfbf49b2ecaf86d21eeeb20d2301f80;p=config

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

1acab9749bfbf49b2ecaf86d21eeeb20d2301f80