From b76cfbcdb4346a191d8448b42494a8975b430fcf Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 11 Apr 2015 23:20:25 +0000
Subject: [PATCH] Fix a copy/paste error in a comment.

see #31951.
Built from https://develop.svn.wordpress.org/trunk@32115


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

diff --git a/wp-includes/compat.php b/wp-includes/compat.php
index 4196102f4f..43667053f1 100644
--- a/wp-includes/compat.php
+++ b/wp-includes/compat.php
@@ -40,7 +40,7 @@ endif;
 
 function _mb_strlen( $str, $encoding = null ) {
 	// The solution below works only for UTF-8,
-	// so in case of a different charset just use built-in substr()
+	// so in case of a different charset just use built-in strlen()
 	$charset = get_option( 'blog_charset' );
 	if ( ! in_array( $charset, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 		return strlen( $str );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 27b15dbf33..25a1bec4e3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32114';
+$wp_version = '4.2-beta4-32115';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.