Merge revision #r8343
commit08dad6031c3194ec22e8f3266d231d0ef6cfae21
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 29 Jan 2008 14:33:53 +0000 (29 14:33 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 29 Jan 2008 14:33:53 +0000 (29 14:33 +0000)
tree882a18b8fe1e70165f9dd8893ca41302dd3cf315
parent2682748c6cd9182b7fd55f6ba8619a2c7d28e4d6
Merge revision #r8343

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8344 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/docs/CHANGELOG.html
phpBB/includes/session.php