Merge revision #r8334
commitda69674977bcb7a277ca9c2f02bb9cf043c205ea
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 29 Jan 2008 14:35:29 +0000 (29 14:35 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 29 Jan 2008 14:35:29 +0000 (29 14:35 +0000)
tree3ad0132b840c6ababa4121a0b53c3abaa96f4481
parent08dad6031c3194ec22e8f3266d231d0ef6cfae21
Merge revision #r8334

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