merge in r9144
commit652371ba35745803220a3533f73f9bd2ffc81ba0
authortoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 1 Dec 2008 17:04:58 +0000 (1 17:04 +0000)
committertoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 1 Dec 2008 17:04:58 +0000 (1 17:04 +0000)
tree134bff403779d42f3eb043e74134db7ca8a70a25
parente459c89d38c54f3ef5ea4a3899b406ead460f10c
merge in r9144

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