Oskar Hahn 0cf0e58af9 Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides ... Conflicts: openslides/assignment/models.py		2012-09-13 15:28:35 +02:00
..
LC_MESSAGES	Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides	2012-09-13 15:28:35 +02:00