merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390
commit96ee0ea8735c2061c31a4efd99e7e47a09600ddc
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 23 Feb 2008 14:23:34 +0000 (23 14:23 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 23 Feb 2008 14:23:34 +0000 (23 14:23 +0000)
treea2302e0bfabf2800b44870c8b14d3c75a12dc612
parent49e8762e6724340f5db36fbea85c42659362caea
merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
30 files changed:
phpBB/adm/index.php
phpBB/adm/style/acp_database.html
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/docs/coding-guidelines.html
phpBB/includes/acm/acm_file.php
phpBB/includes/acp/acp_attachments.php
phpBB/includes/acp/acp_bbcodes.php
phpBB/includes/acp/acp_main.php
phpBB/includes/acp/acp_permissions.php
phpBB/includes/acp/acp_styles.php
phpBB/includes/acp/acp_users.php
phpBB/includes/acp/auth.php
phpBB/includes/auth.php
phpBB/includes/functions.php
phpBB/includes/functions_admin.php
phpBB/includes/functions_content.php
phpBB/includes/functions_profile_fields.php
phpBB/includes/functions_upload.php
phpBB/includes/ucp/ucp_attachments.php
phpBB/includes/ucp/ucp_groups.php
phpBB/includes/ucp/ucp_profile.php
phpBB/install/database_update.php
phpBB/install/install_convert.php
phpBB/language/en/acp/groups.php
phpBB/language/en/acp/users.php
phpBB/language/en/common.php
phpBB/language/en/memberlist.php
phpBB/language/en/ucp.php
phpBB/styles/prosilver/template/mcp_topic.html