From: Markus Raab <elektra@markus-raab.org>
Date: Tue, 3 Dec 2013 14:47:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=73450bcacd6925dcd99149e732b799ab3ee03ead;hp=73450bcacd6925dcd99149e732b799ab3ee03ead;p=debienna.git

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