From: Markus Raab <elektra@markus-raab.org>
Date: Wed, 6 Nov 2013 10:46:22 +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=4386de4fc88210c784bf99e6747f7a18615451ec

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

4386de4fc88210c784bf99e6747f7a18615451ec