Merge "Removed ProfilerStandard and ProfilerSimpleTrace"

diff --combined RELEASE-NOTES-1.25
index faab698,db36b31..6ba8bfa
--- 1/RELEASE-NOTES-1.25
--- 2/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@@ -33,6 -33,9 +33,9 @@@ production
  * (T46740) The temporary option $wgIncludejQueryMigrate was removed, along
    with the jQuery Migrate library, as indicated when this option was provided in
    MediaWiki 1.24.
+ * ProfilerStandard and ProfilerSimpleTrace were removed. Make sure that any
+   StartProfiler.php config is updated to reflect this. Xhprof is available
+   for zend/hhvm. Also, for hhvm, one can consider using its xenon profiler.
  
  === New features in 1.25 ===
  * (T64861) Updated plural rules to CLDR 26. Includes incompatible changes
@@@ -173,10 -176,6 +176,10 @@@
    for the 'aimime' parameter.
  * prop=info with inprop=protections will now return applicable protection types
    with the 'restrictiontypes' key.
 +* (T85417) When resolving redirects, ApiPageSet will now add the targets of
 +  interwiki redirects to the list of interwiki titles.
 +* (T85417) When outputting the list of redirect titles, a 'tointerwiki'
 +  property (like the existing 'tofragment' property) will be set.
  
  === Action API internal changes in 1.25 ===
  * ApiHelp has been rewritten to support i18n and paginated HTML output.