From: Markus Raab <elektra@markus-raab.org>
Date: Thu, 3 Oct 2013 17:09:24 +0000 (+0200)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/?p=debienna.git;a=commitdiff_plain;h=3533d464e7a31cd993c79a4d3ed4a78ca18f80a3

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

3533d464e7a31cd993c79a4d3ed4a78ca18f80a3