(a little test for later merges)mastertrunk
commit255971b6a94fb6fef54a782e9e1c01de56bc00f3
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 6 Oct 2009 13:40:01 +0000 (6 13:40 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 6 Oct 2009 13:40:01 +0000 (6 13:40 +0000)
treebf744132e028c3ee692ea8239fcb340f4a533adb
parent324a84ac96718ad7dffe345c866ef42b45f64710
(a little test for later merges)
reintegrate branch into trunk (r10214)

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