merge...
commit72b32efdb64dee84f78f251d2d52e95784001c8d
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sun, 8 Jun 2008 21:44:59 +0000 (8 21:44 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sun, 8 Jun 2008 21:44:59 +0000 (8 21:44 +0000)
treecf0721c95893f960cdaef194efef82698a3e824e
parentc6d22f7704180022f252cc3c8ef8bc8b1024934f
merge...

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8624 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/includes/functions.php
phpBB/includes/mcp/mcp_warn.php
phpBB/includes/ucp/ucp_pm_compose.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/posting.php