From: Markus Raab <elektra@markus-raab.org>
Date: Wed, 12 Aug 2015 18:29:43 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.deb.at/debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=e04f47dd22bb8108d949831b4fb01ab216af5edc;p=debienna.git

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

e04f47dd22bb8108d949831b4fb01ab216af5edc