Merge branch 'OpenSlidesError' into workflow_2

Conflicts:
	openslides/utils/exceptions.py
This commit is contained in:
Norman Jäckel 2013-02-13 23:05:50 +01:00
commit 6223b3199d

Diff Content Not Available