Merge branch 'master' of debienna.at:debienna
authorSebastian Bachmann <me@free-minds.net>
Thu, 27 Feb 2014 18:41:56 +0000 (19:41 +0100)
committerSebastian Bachmann <me@free-minds.net>
Thu, 27 Feb 2014 18:41:56 +0000 (19:41 +0100)
commit3160cb9dcfe5dd97ccfee8e9a18f078f81b13598
treeeb7693e09615b6ad0465cdbbd2f1f3ecb243d0d1
parent6931a7f7263d2bf8cbf784e9176ea4703388741e
parent23503af44fbaf6dac6d6973868ce47376dd4f8f5
Merge branch 'master' of debienna.at:debienna

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