From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 9 Dec 2012 14:33:14 +0000 (+0100)
Subject: Merge branch 'master' into feature-33-capsules
X-Git-Url: http://git.localhorst.tv/?p=l2e.git;a=commitdiff_plain;h=60e0fe29ce6cd033edc78b181d9d07fa72c11172

Merge branch 'master' into feature-33-capsules

I am a dork
---

60e0fe29ce6cd033edc78b181d9d07fa72c11172