merge? merge.
commit9019905b488a3c794f423ed3a0132fe4f65dfea8
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 23 Jun 2008 18:22:44 +0000 (23 18:22 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Mon, 23 Jun 2008 18:22:44 +0000 (23 18:22 +0000)
tree0190f40f45cf190dfc5a2a1e0053fa899c14ddce
parent602941b2d781bc4b47343c64476c64c614b86eb2
merge? merge.

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
14 files changed:
phpBB/develop/create_schema_files.php
phpBB/docs/AUTHORS
phpBB/includes/functions.php
phpBB/includes/functions_content.php
phpBB/includes/functions_convert.php
phpBB/includes/functions_posting.php
phpBB/includes/functions_user.php
phpBB/includes/message_parser.php
phpBB/includes/session.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.php
phpBB/search.php
phpBB/styles/prosilver/template/message_body.html
phpBB/styles/subsilver2/template/search_results.html