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

Merge branch 'master' into feature-33-capsules

needed for fixed cbp file
---

67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5