hmm, this seems to be a merge i forgot
commita1387577e6b53e84e56ff5297995cbfb8f051b15
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 29 Jul 2008 13:39:50 +0000 (29 13:39 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 29 Jul 2008 13:39:50 +0000 (29 13:39 +0000)
tree1029b5ed5fe9afeea274e4f93030e343a5edd45f
parentc67d67f9198a52def8242b1623199080230f56b8
hmm, this seems to be a merge i forgot

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