Merge "Update wikimedia/composer-merge-plugin from 1.4.0 -> 1.4.1"

diff --combined RELEASE-NOTES-1.30
index 4581066,7b1a7ce..87e6ce5
--- 1/RELEASE-NOTES-1.30
--- 2/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@@ -5,10 -5,6 +5,10 @@@ THIS IS NOT A RELEASE YE
  MediaWiki 1.30 is an alpha-quality branch and is not recommended for use in
  production.
  
 +=== MySQL version requirement in 1.30 ===
 +As of 1.30, MediaWiki now requires MySQL 5.5.8 or higher (see Compatibility
 +section).
 +
  === Configuration changes in 1.30 ===
  * The "C.UTF-8" locale should be used for $wgShellLocale, if available, to avoid
    unexpected behavior when code uses locale-sensitive string comparisons. For
@@@ -50,6 -46,7 +50,7 @@@
  
  ==== Upgraded external libraries ====
  * mediawiki/mediawiki-codesniffer updated to 0.8.1.
+ * wikimedia/composer-merge-plugin updated to 1.4.1.
  
  ==== New external libraries ====
  * The class \TestingAccessWrapper has been moved to the external library
@@@ -151,7 -148,7 +152,7 @@@ Oracle and Microsoft SQL Server
  
  The supported versions are:
  
 -* MySQL 5.0.3 or later
 +* MySQL 5.5.8 or later
  * PostgreSQL 8.3 or later
  * SQLite 3.3.7 or later
  * Oracle 9.0.1 or later