From: Markus Raab <elektra@markus-raab.org>
Date: Wed, 29 Jan 2014 17:35:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=8d33bdf89ceae5ac5bffcbf65b73d5c3ab24a1db;p=debienna.git

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

8d33bdf89ceae5ac5bffcbf65b73d5c3ab24a1db