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

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

7544b1fc236131c1cb28e4db53681bc10a6f57c1