From: Markus Raab <elektra@markus-raab.org>
Date: Fri, 16 Jan 2015 09:04:54 +0000 (+0100)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=a6984f6655a6293e9a59a1d392385f91face6a38;hp=a6984f6655a6293e9a59a1d392385f91face6a38;p=debienna.git

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

Conflicts:
	Kalender/2015-01-15/index.mdwn
---