Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts:
	code/CommentAdmin.php
This commit is contained in:
Ingo Schommer 2013-03-19 13:51:22 +01:00
commit 0aeace2aec

Diff Content Not Available