Merge branch 'develop-olympus' into develop

phpBB/install/convertors/convert_phpbb20.php

@@ -32,7 +32,7 @@ unset($dbpasswd);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.0.7',
+	'phpbb_version'	=> '3.0.7-PL1',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
@@ -83,7 +83,7 @@ $tables = array(
 * 	'table_format'	=>	'file',
 * 	'filename'	=>	'NAME OF FILE', // If the file is not in the root directory, the path needs to be added with no leading slash
 * 	'array_name' => 'NAME OF ARRAY', // Only used if the configuration file stores the setting in an array.
-* 	'settings'		=>	array( 
+* 	'settings'		=>	array(
 *        'board_email' => 'SUPPORT_EMAIL', // target config name => source target name
 * 	)
 * );

phpBB/install/database_update.php

@@ -911,6 +911,8 @@ function database_update_info()
 		'3.0.7-RC1'		=> array(),
 		// No changes from 3.0.7-RC2 to 3.0.7
 		'3.0.7-RC2'		=> array(),
+		// No changes from 3.0.7 to 3.0.7-PL1
+		'3.0.7'		=> array(),
 	);
 }
 
@@ -1642,6 +1644,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.7-RC2 to 3.0.7
 		case '3.0.7-RC2':
 		break;
+
+		// No changes from 3.0.7 to 3.0.7-PL1
+		case '3.0.7':
+		break;
 	}
 }