Andreas Fischer f49be85859 Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html		2013-05-19 15:44:25 +02:00
..
prosilver	Merge branch 'develop-olympus' into develop	2013-05-19 15:44:25 +02:00
subsilver2	[ticket/11533] Fix colspan and unnecessary tables	2013-05-11 23:32:55 +03:00