OpenSlides/openslides/locale/de
René Köcher ed33b47666 Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides
Conflicts:
	openslides/locale/de/LC_MESSAGES/django.po

Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 12:52:11 +01:00
..
LC_MESSAGES Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides 2012-11-22 12:52:11 +01:00