merge revisions #r8392 and #r8393
commit81e97d7871c4636d88202eee5b995ac055509fbd
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 23 Feb 2008 15:32:34 +0000 (23 15:32 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 23 Feb 2008 15:32:34 +0000 (23 15:32 +0000)
treeaba50bda8d5834410c39988aa9aac738b6ea6d2c
parent96ee0ea8735c2061c31a4efd99e7e47a09600ddc
merge revisions #r8392 and #r8393

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8394 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/docs/CHANGELOG.html
phpBB/includes/message_parser.php