From: Markus Raab <elektra@markus-raab.org>
Date: Thu, 3 Oct 2013 18:46:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=70b2ef2c834f24a9bc76c03f0adde64f1365fb6e;p=debienna.git

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

70b2ef2c834f24a9bc76c03f0adde64f1365fb6e