From 756e445a5367729e9cb60dde829f66dba15c7325 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 16 Mar 2015 01:56:27 +0000
Subject: [PATCH] Fix typo in a comment in [31752].

see #31242.
Built from https://develop.svn.wordpress.org/trunk@31790


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

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 266397dfc6..4e7d0da664 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -4126,7 +4126,7 @@ function wp_staticize_emoji( $text ) {
 
 	$output = '';
 	/*
-	 * HTML loop taken from smiley function, which was taking from texturize function.
+	 * HTML loop taken from smiley function, which was taken from texturize function.
 	 * It'll never be consolidated.
 	 *
 	 * First, capture the tags as well as in between.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b7940c3887..1a29fc3632 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta1-31789';
+$wp_version = '4.2-beta1-31790';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.