From: Markus Raab <elektra@markus-raab.org>
Date: Thu, 30 May 2013 19:08:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=ff964968cc50afaabfdb991ad0f4b553d43fd545;p=debienna.git

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

ff964968cc50afaabfdb991ad0f4b553d43fd545