Merge branch 'phpbb:3.3.x' into replace_chumper_zipper

Author: Skouat

config/config.php

@@ -184,7 +184,7 @@ public function set_default_config()
 				'30'	=> array('latest_revision' => '14', 'name' => 'phpBB 3.0.x', 'allow_uploads' => false),
 				'31'	=> array('latest_revision' => '12', 'name' => 'phpBB 3.1.x', 'allow_uploads' => false),
 				'32'	=> array('latest_revision' => '11', 'name' => 'phpBB 3.2.x', 'allow_uploads' => false),
-				'33'	=> array('latest_revision' => '14', 'name' => 'phpBB 3.3.x', 'allow_uploads' => true),
+				'33'	=> array('latest_revision' => '15', 'name' => 'phpBB 3.3.x', 'allow_uploads' => true),
 			)),
 
 			// MPV server(s)

includes/language_packages/british_english_3_3_15.zip

@@ -80,7 +80,7 @@
 	'EXTENSION_UPDATE_PUBLIC_NOTES'		=> '
 
 [b]Notes:[/b] %1$s',
-	'EXTENSION_UPLOAD_AGREEMENT'		=> '<span style="font-size: 1.5em;">By submitting this revision you agree to abide by the <a href="https://www.phpbb.com/extensions/rules-and-policies/">Extensions database policies</a> and that your extension conforms to and follows the <a href="https://area51.phpbb.com/docs/32x/coding-guidelines.html">phpBB 3.2 Coding Guidelines</a>.
+	'EXTENSION_UPLOAD_AGREEMENT'		=> '<span style="font-size: 1.5em;">By submitting this revision you agree to abide by the <a href="https://www.phpbb.com/extensions/rules-and-policies/">Extensions database policies</a> and that your extension conforms to and follows the <a href="https://area51.phpbb.com/docs/33x/coding-guidelines.html">phpBB 3.3 Coding Guidelines</a>.
 
 You also agree and accept that this extension is to be released under the <a href="https://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</a> and that the license of any included components are compatible with the <a href="https://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</a> and that you also allow the re-distribution of your extension through this website indefinitely. For a list of available licenses and licenses compatible with the GNU GPLv2 please reference the <a href="https://en.wikipedia.org/wiki/List_of_FSF_approved_software_licenses">list of FSF approved software licenses</a>.</span>',
 	'EXTENSION_VALIDATION'				=> '[phpBB Extension-Validation] %1$s %2$s',