Merge branch 'master' of debienna.at:debienna
authorchrysn <chrysn@fsfe.org>
Wed, 1 Jul 2015 13:01:20 +0000 (15:01 +0200)
committerchrysn <chrysn@fsfe.org>
Wed, 1 Jul 2015 13:01:20 +0000 (15:01 +0200)
commitaafbfa78ca6965505e2148ccf841f5d8340bf051
tree3c872ccaeca167a6ac2747dce3c4707ffe4d0731
parent7f202e789912eb7966540c7ddc0b306ef58ad9c2
parent80fdaffffc17efaeb5e43cfb3432118d080a63e7
Merge branch 'master' of debienna.at:debienna

Conflicts:
Kalender/2015-06-18/index.mdwn
Kalender/2015-06-18/index.mdwn