From: Markus Raab <elektra@markus-raab.org>
Date: Sun, 12 Jan 2014 14:38:37 +0000 (+0100)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=9010e9684a860aa28db13b1d059cba4d0ae965e9;hp=dee9453e3ec482f3c1a4a039a0a2a8e698534493;p=debienna.git

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