From bee439858b20227b6148f84d0df67b8a88a1b746 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 18 Jan 2015 19:05:22 +0000
Subject: [PATCH] Minor fix for inline doc syntax in a changelog entry for
 `wp_get_object_terms()`.

See #28688.

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


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

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 374495c1b8..078e04f868 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -2554,7 +2554,7 @@ function wp_delete_category( $cat_ID ) {
  * Retrieves the terms associated with the given object(s), in the supplied taxonomies.
  *
  * @since 2.3.0
- * @since 4.2.0 Added support for 'taxonomy', 'parent', and 'term_taxonomy_id' values of $orderby.
+ * @since 4.2.0 Added support for 'taxonomy', 'parent', and 'term_taxonomy_id' values of `$orderby`.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 56391410a0..bad6db3b47 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31237';
+$wp_version = '4.2-alpha-31238';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.