merge in r9145
commit769e9b4b8c907d0d157d79fb955215b5f7c3c1e9
authortoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 1 Dec 2008 17:28:32 +0000 (1 17:28 +0000)
committertoonarmy <toonarmy@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 1 Dec 2008 17:28:32 +0000 (1 17:28 +0000)
tree936743f73d4463f3e968aabd7f6476a368afcd2a
parent652371ba35745803220a3533f73f9bd2ffc81ba0
merge in r9145

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