From 229d71e0f8e518cd95ce4e93718ca11689b3c2e4 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Mon, 14 Oct 2019 20:15:21 +0000
Subject: [PATCH] WordPress 4.2.25. Built from
 https://develop.svn.wordpress.org/branches/4.2@46518

git-svn-id: http://core.svn.wordpress.org/branches/4.2@46315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      | 22 +++++++++++++++++++++-
 wp-includes/version.php |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 1493fa7b66..11ebea1ae3 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -41,7 +41,27 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 </h2>
 
 <div class="changelog point-releases">
-	<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 24 ); ?></h3>
+	<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 25 ); ?></h3>
+	<p>
+		<?php
+		printf(
+			/* translators: %s: WordPress version number */
+			__( '<strong>Version %s</strong> addressed some security issues.' ),
+			'4.2.25'
+		);
+		?>
+		<?php
+		printf(
+			/* translators: %s: HelpHub URL */
+			__( 'For more information, see <a href="%s">the release notes</a>.' ),
+			sprintf(
+				/* translators: %s: WordPress version */
+				esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+				sanitize_title( '4.2.25' )
+			)
+		);
+		?>
+	</p>
 	<p>
 		<?php
 		printf(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0a916fe73e..cdd4a1d5fd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2.24';
+$wp_version = '4.2.25';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.