Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Fri, 16 Jan 2015 09:04:54 +0000 (10:04 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Fri, 16 Jan 2015 09:04:54 +0000 (10:04 +0100)
commita6984f6655a6293e9a59a1d392385f91face6a38
treeaa92a323dadc04f0d2b11619c5b5a78fecc5723b
parent3c9fbf3ee5b1c90d82be79778847315044855dfd
parent0002ac54a3f8692fb0d7d401fdf8240ad31c4c06
Merge branch 'master' of ssh://debienna.at/debienna

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