From 654ee78c930583de5139f5af14bfc8cefb99e8ea Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 4 Apr 2015 21:09:27 +0000
Subject: [PATCH] Clarify 4.2.0 changelog entry, add global description to the
 DocBlock for `WP_Users_List_Table->single_row()`.

See #31888.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-users-list-table.php | 4 +++-
 wp-includes/version.php                         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 1c3cd29acf..5006736370 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -326,9 +326,11 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * Generate HTML for a single row on the users.php admin panel.
 	 *
 	 * @since 3.1.0
-	 * @since 4.2.0 `$style` argument was deprecated.
+	 * @since 4.2.0 The `$style` argument was deprecated.
 	 * @access public
 	 *
+	 * @global WP_Roles $wp_roles User roles object.
+	 *
 	 * @param object $user_object The current user object.
 	 * @param string $style       Deprecated. Not used.
 	 * @param string $role        Optional. Key for the $wp_roles array. Default empty.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 08dadc42fe..eadc71f898 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32014';
+$wp_version = '4.2-beta4-32015';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.