From: Sebastian Bachmann <me@free-minds.net>
Date: Thu, 27 Feb 2014 18:41:56 +0000 (+0100)
Subject: Merge branch 'master' of debienna.at:debienna
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=3160cb9dcfe5dd97ccfee8e9a18f078f81b13598;hp=3160cb9dcfe5dd97ccfee8e9a18f078f81b13598;p=debienna.git

Merge branch 'master' of debienna.at:debienna

Conflicts:
	Kalender/2014-02-27/index.mdwn
---