From c2260dc85b279ac202a2fc4a6b42fb1211cd7b3a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 6 Jan 2015 01:57:22 +0000
Subject: [PATCH] Remove obsolete inline comment.

props travisnorthcutt.
fixes #30924.
Built from https://develop.svn.wordpress.org/trunk@31056


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

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index ae97efdd77..734509a44e 100644
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -154,7 +154,7 @@ function wp_plugin_directory_constants() {
 /**
  * Defines cookie related WordPress constants
  *
- * Defines constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
+ * Defines constants after multisite is loaded.
  * @since 3.0.0
  */
 function wp_cookie_constants() {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ba14c59478..a9f2f2f798 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31055';
+$wp_version = '4.2-alpha-31056';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-settings.php b/wp-settings.php
index 97959716b3..715a2c2802 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -192,7 +192,7 @@ do_action( 'muplugins_loaded' );
 if ( is_multisite() )
 	ms_cookie_constants(  );
 
-// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
+// Define constants after multisite is loaded.
 wp_cookie_constants();
 
 // Define and enforce our SSL constants