From d19de136c688b91223ea1ad2e400a58a3ae04f74 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Tue, 4 Nov 2014 15:59:23 +0000
Subject: [PATCH] Merge a multi-line comment into a single-line comment in
 wp-includes/link-template.php.

See [30166]. See #30224.

Built from https://develop.svn.wordpress.org/trunk@30226


git-svn-id: http://core.svn.wordpress.org/trunk@30226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 3 +--
 wp-includes/version.php       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index effc3063a6..8d6830ca5f 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -2333,8 +2333,7 @@ function get_the_pagination( $args = array() ) {
 		// Set up paginated links.
 		$links = paginate_links( $args );
 
-		// _navigation_markup() expects string,
-		// paginate_links() can return an array
+		// `navigation_markup()` expects a string, `paginate_links()` can return an array.
 		if ( $links && ! is_array( $links ) ) {
 			$navigation = _navigation_markup( $links, 'pagination' );
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d922251fed..d16e5c67a9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30225';
+$wp_version = '4.1-alpha-30226';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.