From: Markus Raab <elektra@markus-raab.org>
Date: Thu, 28 Nov 2013 13:05:18 +0000 (+0100)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=e3f7cfba564d00e3ee557814901e0fc83ead9338;hp=e3f7cfba564d00e3ee557814901e0fc83ead9338;p=debienna.git

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