Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Thu, 19 Feb 2015 20:00:15 +0000 (21:00 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Thu, 19 Feb 2015 20:00:15 +0000 (21:00 +0100)
commit9f1579cb33a89de69ab913834f32dc3b98e266b0
treea5625a509128dc5094adaf12c03a9b9d50242334
parent0c82215ba7daf2d19b3451d40fd24016bf1f2757
parent3e97bbdd6faea4452f324907adc9f792bd30596a
Merge branch 'master' of ssh://debienna.at/debienna

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