Oskar Hahn 34b6ca80f3 Merge branch 'stable/1.6.x' ... Conflicts: CHANGELOG openslides/users/signals.py		2015-01-06 13:04:07 +01:00
..
agenda	Merge branch 'stable/1.6.x'	2015-01-06 13:04:07 +01:00
search	Some bug fixing for 1.5b1	2013-10-21 14:39:28 +02:00