git.deb.at Git - debienna.git/commit

author	Markus Raab <elektra@markus-raab.org>
	Thu, 19 Feb 2015 20:00:15 +0000 (21:00 +0100)
committer	Markus Raab <elektra@markus-raab.org>
	Thu, 19 Feb 2015 20:00:15 +0000 (21:00 +0100)
commit	9f1579cb33a89de69ab913834f32dc3b98e266b0
tree	a5625a509128dc5094adaf12c03a9b9d50242334	tree \| snapshot
parent	0c82215ba7daf2d19b3451d40fd24016bf1f2757	commit \| diff
parent	3e97bbdd6faea4452f324907adc9f792bd30596a	commit \| diff

Merge branch 'master' of ssh://debienna.at/debienna

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