From 0ac92b3c2eb7e985acb5e3613b9f8a2b2fb42e31 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Thu, 13 Dec 2018 02:16:07 +0000
Subject: [PATCH] Bump 4.0 branch to version 4.0.25.

Built from https://develop.svn.wordpress.org/branches/4.0@44087


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

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 9c1be672fe..09bb595dc7 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -42,7 +42,17 @@ 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
+		/* translators: %s: WordPress version number */
+		printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.0.25' );
+		?>
+		<?php
+		/* translators: %s: Codex URL */
+		printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.0.25' );
+		?>
+	</p>
 	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
 			'<strong>Version %1$s</strong> addressed some security issues.', 1 ), '4.0.24' ); ?>
 		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.0.24' ); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 74d56df249..2bba74c142 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.0.24';
+$wp_version = '4.0.25';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.