merge r8970 and r8971
commit7a15bd9af31390e8894e4217369a8ff02a1bb283
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 6 Oct 2008 05:52:49 +0000 (6 05:52 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 6 Oct 2008 05:52:49 +0000 (6 05:52 +0000)
tree286b1fbdd7bfd2e7a5ddbd6f363e8d8dc478516a
parent021c77f601db78f2f1d05bad41620b048f31e01d
merge r8970 and r8971

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8972 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/adm/style/acp_users.html
phpBB/includes/functions_content.php
phpBB/includes/functions_messenger.php
phpBB/viewtopic.php