phpBB 3.0.12
phpBB Danish 1.0.26
Prosilver from 3.0.12
Merge branch 'Update-phpbb-theme'

Conflicts:
	forum/styles/light-phpbb-theme/imageset/imageset.cfg
	forum/styles/light-phpbb-theme/style.cfg
	forum/styles/light-phpbb-theme/template/login_forum.html
	forum/styles/light-phpbb-theme/template/mcp_topic.html
	forum/styles/light-phpbb-theme/template/memberlist_body.html
	forum/styles/light-phpbb-theme/template/memberlist_leaders.html
	forum/styles/light-phpbb-theme/template/overall_footer.html
	forum/styles/light-phpbb-theme/template/overall_header.html
	forum/styles/light-phpbb-theme/template/search_body.html
	forum/styles/light-phpbb-theme/template/search_results.html
	forum/styles/light-phpbb-theme/template/template.cfg
	forum/styles/light-phpbb-theme/template/ucp_groups_manage.html
	forum/styles/light-phpbb-
theme/template/ucp_pm_message_header.html
	forum/styles/light-phpbb-theme/template/ucp_pm_viewmessage.html
	forum/styles/light-phpbb-
theme/template/ucp_profile_reg_details.html
	forum/styles/light-phpbb-theme/template/viewonline_body.html
	forum/styles/light-phpbb-theme/template/viewtopic_print.html
	forum/styles/light-phpbb-theme/theme/common.css
	forum/styles/light-phpbb-theme/theme/theme.cfg
	forum/styles/light-phpbb-theme/theme/tweaks.css
Fix  merge

Conflicts:
	forum/common.php
	forum/docs/AUTHORS
	forum/docs/CHANGELOG.html
	forum/docs/FAQ.html
	forum/docs/INSTALL.html
	forum/docs/README.html
	forum/docs/auth_api.html
	forum/docs/coding-guidelines.html
	forum/docs/hook_system.html
	forum/install/convertors/convert_phpbb20.php
	forum/install/database_update.php
	forum/install/index.php
	forum/install/install_convert.php
	forum/install/install_install.php
	forum/install/schemas/schema_data.sql
	forum/posting.php