From: Markus Raab <elektra@markus-raab.org>
Date: Wed, 18 Dec 2013 19:15:48 +0000 (+0100)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/?p=debienna.git;a=commitdiff_plain;h=8a26e32ffb7be936b83ae62b1464334e94a2a350

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

8a26e32ffb7be936b83ae62b1464334e94a2a350