merge
commit54b7b137896adbad9a4f887d9a66651bbfffcdd2
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 26 May 2008 12:05:22 +0000 (26 12:05 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 26 May 2008 12:05:22 +0000 (26 12:05 +0000)
treec93c4a117c364426cb8394c6f2004041bddd2b79
parentf6ae1dad21eefd8c350b97830112dd711b27d7df
merge

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8570 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/includes/functions_privmsgs.php
phpBB/includes/ucp/ucp_pm_viewfolder.php
phpBB/styles/prosilver/template/ucp_pm_history.html