Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Fri, 20 Nov 2015 09:19:59 +0000 (10:19 +0100)
committerchrysn <chrysn@fsfe.org>
Fri, 20 Nov 2015 09:19:59 +0000 (10:19 +0100)
commita079f5eb6bd794eca9751aa348ff92682decec80
tree9d8b7800b2ee49fdcee00591c8215169dae3ff9f
parent1699a0bf53365142799256f8d93714b4714a43b1
parent39cd39fc93027727c88c6815e1bb1b5054c270a6
Merge branch 'master' of git.deb.at:debienna

Conflicts:
Kalender/2015-11-19/index.mdwn
Kalender/2015-11-19/index.mdwn