Marc Alexander 1aae72961a Merge branch 'develop' into feature/avatars ...

Conflicts:
	phpBB/install/database_update.php

2012-12-09 21:02:31 +01:00

..

ucp_attachments.php

…

ucp_groups.php

…

ucp_main.php

…

ucp_pm.php

…

ucp_prefs.php

…

ucp_profile.php

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

ucp_zebra.php

…