Merge in r8940, r8941, r8942, r8945, r8946, r8947, r8949, r8950, r8951
commit756deb6decf8429714ad620394591f9994460192
authortoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 27 Sep 2008 11:45:30 +0000 (27 11:45 +0000)
committertoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 27 Sep 2008 11:45:30 +0000 (27 11:45 +0000)
tree65e3735931afeb265e6d2749b3d7925951693b29
parent099febbb33b6a778ef20836aa3c5b170641520b1
Merge in r8940, r8941, r8942, r8945, r8946, r8947, r8949, r8950, r8951

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8952 89ea8834-ac86-4346-8a33-228a782c2dd0
14 files changed:
phpBB/docs/coding-guidelines.html
phpBB/includes/functions_privmsgs.php
phpBB/includes/functions_user.php
phpBB/includes/mcp/mcp_main.php
phpBB/includes/mcp/mcp_reports.php
phpBB/includes/mcp/mcp_topic.php
phpBB/language/en/acp/attachments.php
phpBB/language/en/acp/common.php
phpBB/language/en/common.php
phpBB/language/en/mcp.php
phpBB/styles/prosilver/template/mcp_post.html
phpBB/styles/prosilver/template/ucp_pm_history.html
phpBB/styles/subsilver2/template/mcp_post.html
phpBB/styles/subsilver2/template/ucp_pm_history.html