From: Sebastian Bachmann <me@free-minds.net>
Date: Wed, 9 Oct 2013 11:28:21 +0000 (+0200)
Subject: Merge branch 'master' of debienna.at:debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=1ebbd7e42af7c6192ea4cb78c0fcac380d48cb7e;p=debienna.git

Merge branch 'master' of debienna.at:debienna
---

1ebbd7e42af7c6192ea4cb78c0fcac380d48cb7e