merge
commit1a6458ae90c3bc0f0babcced4d9efe33f037473b
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Wed, 30 Apr 2008 15:56:02 +0000 (30 15:56 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Wed, 30 Apr 2008 15:56:02 +0000 (30 15:56 +0000)
treea135fd1bad78e0de2383393aa5483c517674f4a4
parentf505547ee225404bb5cc16e25e76aae63375ba3f
merge

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