merged #r8490
commit567f66f5fb12224df547a43750fd2fd62f96a187
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Fri, 11 Apr 2008 14:22:59 +0000 (11 14:22 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Fri, 11 Apr 2008 14:22:59 +0000 (11 14:22 +0000)
treed2e706c3941412207639b6202167a9898e924753
parentef56ff6820ef83d3a01b5fec88b4043debf6c367
merged #r8490

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8504 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/includes/functions.php