From acef02f060194455cf13526bf53ae016415d15f7 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Sat, 11 Apr 2015 02:17:29 +0000
Subject: [PATCH] Smilies: One more tweak to matching smilies with emoji.

Props iseulde.

See #31709.


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


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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 534deb0942..7a49026563 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2991,7 +2991,7 @@ function smilies_init() {
 		       ':?' => "\xf0\x9f\x98\x95",
 		       ':D' => "\xf0\x9f\x98\x80",
 		       ':P' => "\xf0\x9f\x98\x9b",
-		       ':o' => "\xf0\x9f\x98\xaf",
+		       ':o' => "\xf0\x9f\x98\xae",
 		       ':x' => "\xf0\x9f\x98\xa1",
 		       ':|' => "\xf0\x9f\x98\x90",
 		       ';)' => "\xf0\x9f\x98\x89",
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 16b42f95b8..ffb04eed0c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32106';
+$wp_version = '4.2-beta4-32107';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.