Marc Alexander 5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ... Conflicts: phpBB/includes/ucp/ucp_groups.php		2013-01-04 10:49:57 +01:00
..
prosilver	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars	2013-01-04 10:49:57 +01:00
subsilver2	[feature/avatars] Inform user of no available local avatars	2013-01-04 10:25:08 +01:00