merge revisions i missed... hopefully not breaking things - did not check every change.
commit93711de166739af58fcbb5a49ad9604f8876e0cf
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 22 Nov 2008 19:38:25 +0000 (22 19:38 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sat, 22 Nov 2008 19:38:25 +0000 (22 19:38 +0000)
treef84899714e91ff360dcf16122d0ef723f5cefa15
parent6e6d4995c1f457fb77fa9ef40f028c32cfbecd35
merge revisions i missed... hopefully not breaking things - did not check every change.

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
33 files changed:
phpBB/adm/style/acp_main.html
phpBB/adm/style/admin.css
phpBB/adm/style/permission_mask.html
phpBB/docs/INSTALL.html
phpBB/docs/coding-guidelines.html
phpBB/includes/acm/acm_file.php
phpBB/includes/acp/acp_attachments.php
phpBB/includes/acp/acp_groups.php
phpBB/includes/acp/acp_main.php
phpBB/includes/acp/acp_styles.php
phpBB/includes/functions.php
phpBB/includes/functions_messenger.php
phpBB/includes/template.php
phpBB/includes/ucp/ucp_pm_compose.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/install_install.php
phpBB/language/en/acp/styles.php
phpBB/language/en/common.php
phpBB/memberlist.php
phpBB/posting.php
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/faq_body.html
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/content.css
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/faq_body.html
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
phpBB/viewtopic.php