From: Markus Raab <elektra@markus-raab.org>
Date: Thu, 5 Jun 2014 11:10:40 +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=de005bf0fecf93f6755a25bb38ee7378d40a4319

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

de005bf0fecf93f6755a25bb38ee7378d40a4319