From 310940b824eff4a116dcd72ccd339bb602021981 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 10 Jun 2008 14:08:54 +0000
Subject: Merge with branches/2.5 in WordPress, revision 8066

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/functions.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'wp-includes/functions.php')

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 6d37b02..89b4333 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1431,6 +1431,7 @@ function _config_wp_siteurl( $url = '' ) {
 	return $url;
 }
 
+
 function _mce_set_direction( $input ) {
 	global $wp_locale;
 
@@ -1443,6 +1444,7 @@ function _mce_set_direction( $input ) {
 	return $input;
 }
 
+
 function smilies_init() {
 	global $wpsmiliestrans, $wp_smiliessearch, $wp_smiliesreplace;
 
-- 
cgit