Oskar Hahn bd64a6cb5c Merge branch 'stable/1.2.x' ... Conflicts: openslides/application/models.py openslides/application/views.py openslides/participant/forms.py openslides/participant/views.py		2012-08-13 19:16:42 +02:00
..
application	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
projector	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00