Emanuel Schuetze 13cd52bd96 Merged (conflicts).		2013-01-05 15:29:57 +01:00
..
agenda	Merged (conflicts).	2013-01-05 15:29:57 +01:00
projector	fix some typos, mostly {%trans to {% trans	2012-07-16 14:00:29 +02:00