Merge branch 'master' of debienna.at:debienna
authorchrysn <chrysn@fsfe.org>
Thu, 15 Jan 2015 21:01:58 +0000 (22:01 +0100)
committerchrysn <chrysn@fsfe.org>
Thu, 15 Jan 2015 21:01:58 +0000 (22:01 +0100)
commit0002ac54a3f8692fb0d7d401fdf8240ad31c4c06
treeabc3e2f09f581561aecea5ac72ef4cb3da6a7f90
parent7d034f5f5be32aecd9c034af81853dfc9a36354d
parentaf51a0bc312a0e2f032154d38e422e847282f9ea
Merge branch 'master' of debienna.at:debienna

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