Merge in r8843, r8908, r8909
commit98f8eecd7edc6fed816c7d112c61db69edf76bed
authortoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 23 Sep 2008 12:56:34 +0000 (23 12:56 +0000)
committertoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 23 Sep 2008 12:56:34 +0000 (23 12:56 +0000)
tree2b43cc026f1242dc1c4bc2caff372aaf5d45c81c
parentb617fa334b6b93d03737c26c16a41d827c135daa
Merge in r8843, r8908, r8909

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8910 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/includes/functions_admin.php
phpBB/includes/functions_display.php
phpBB/includes/mcp/mcp_main.php
phpBB/language/en/acp/common.php
phpBB/search.php