merge again, revisions 8516 to 8525
commita1b6fd292cedd83423dccef4eb191e8d4d03262a
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 21 Apr 2008 15:10:59 +0000 (21 15:10 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 21 Apr 2008 15:10:59 +0000 (21 15:10 +0000)
tree025fdf94609a4875d691f3580c5bee7ef407f9bc
parent176bd7144ce124c8cd830cf0abb585e8bc7eac4c
merge again, revisions 8516 to 8525

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
13 files changed:
phpBB/includes/acp/acp_database.php
phpBB/includes/functions.php
phpBB/includes/functions_jabber.php
phpBB/includes/functions_posting.php
phpBB/includes/functions_privmsgs.php
phpBB/includes/functions_upload.php
phpBB/includes/functions_user.php
phpBB/includes/mcp/mcp_main.php
phpBB/includes/mcp/mcp_queue.php
phpBB/includes/mcp/mcp_reports.php
phpBB/includes/mcp/mcp_topic.php
phpBB/includes/ucp/ucp_pm.php
phpBB/memberlist.php