Merge "Remove EditFilterMerged detection define"

diff --combined includes/Defines.php
index 8610b8a,432cf7f..c9263da
--- 1/includes/Defines.php
--- 2/includes/Defines.php
+++ b/includes/Defines.php
@@@ -208,7 -208,6 +208,6 @@@ require_once __DIR__ . '/libs/normal/Ut
  /**@{
   * Hook support constants
   */
- define( 'MW_SUPPORTS_EDITFILTERMERGED', 1 );
  define( 'MW_SUPPORTS_PARSERFIRSTCALLINIT', 1 );
  define( 'MW_SUPPORTS_LOCALISATIONCACHE', 1 );
  define( 'MW_SUPPORTS_CONTENTHANDLER', 1 );
@@@ -245,6 -244,11 +244,6 @@@ define( 'SFH_NO_HASH', 1 )
  define( 'SFH_OBJECT_ARGS', 2 );
  /**@}*/
  
 -/**
 - * Flags for Parser::replaceLinkHolders
 - */
 -define( 'RLH_FOR_UPDATE', 1 );
 -
  /**@{
   * Autopromote conditions (must be here and not in Autopromote.php, so that
   * they're loaded for DefaultSettings.php before AutoLoader.php)