* upstream/develop: (666 commits)
[ticket/11077] Remove code from old global announcements system
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
[ticket/11189] Always log critical errors when in cron or in image output
[ticket/11187] Added a blank array to fix errors in functional tests
[ticket/10780] Make L_COLON available in the installer.
[ticket/11183] Remove $load_extensions and weird dl() calls
[ticket/10970] Added extra documentation to parse_dynamic_path.
[ticket/10939] Added documentation for phpbb_request::file
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
...
Conflicts:
phpBB/common.php
phpBB/download/file.php
phpBB/includes/db/dbal.php
phpBB/includes/db/firebird.php
phpBB/includes/db/mssql.php
phpBB/includes/db/mssql_odbc.php
phpBB/includes/db/mssqlnative.php
phpBB/includes/db/mysql.php
phpBB/includes/db/mysqli.php
phpBB/includes/db/oracle.php
phpBB/includes/db/postgres.php
phpBB/includes/db/sqlite.php
phpBB/includes/extension/manager.php
phpBB/install/database_update.php
* github-igorw/feature/dic: (35 commits)
[feature/dic] Spaces to tabs, add useless docblocks
[feature/dic] Remove unneeded newline
[feature/dic] Add a doc block for the prune_forum cron task forum_data
[feature/dic] Update composer.lock to symfony/* RC1
[feature/dic] Fix re-ordering of services
[feature/dic] Fix parse errors
[feature/dic] Add docblock for cron_manager::wrap_task()
[feature/dic] Make cron task attributes protected, one per line
[feature/dic] Coding style: Braces
[feature/dic] Re-order services alphabetically
[feature/dic] Remove duplicate event-dispatcher dependency
[feature/dic] Adjust installer script to work with partially configured container
[feature/dic] Generate full cache driver class name on fresh install
[feature/dic] Adjust cache driver class name for BC
[feature/dic] Rename {phpEx => php_ext} for consistency
[feature/dic] Add trailing newline to htaccess
[feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock file
[feature/dic] Load services from extensions
[feature/dic] Introduce DI processors instead of abusing compiler passes
[feature/dic] Add dbal_ class prefix to dbal.driver.class
...
