From daa4d556bbbc025615b5797bf1f5a98b6237e702 Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 21 Oct 2014 21:56:46 +0200
Subject: [PATCH] Move MergeLogFormatter to 1.25

Follow-Up: I0557a0d2751540cf0d7967333ffd767b934011c6
Change-Id: Id18ba7d925062d795bd129af255cc902e48d30f6
---
 includes/logging/MergeLogFormatter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/logging/MergeLogFormatter.php b/includes/logging/MergeLogFormatter.php
index 6680873906..263d37ad79 100644
--- a/includes/logging/MergeLogFormatter.php
+++ b/includes/logging/MergeLogFormatter.php
@@ -19,13 +19,13 @@
  *
  * @file
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
- * @since 1.24
+ * @since 1.25
  */
 
 /**
  * This class formats merge log entries.
  *
- * @since 1.24
+ * @since 1.25
  */
 class MergeLogFormatter extends LogFormatter {
 	public function getPreloadTitles() {
-- 
2.20.1