Merge with WordPress 2.3.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1139 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 1 insertions, 2 deletions

diff --git a/xmlrpc.php b/xmlrpc.php
index f5aa264..b4a9811 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -32,7 +32,6 @@ header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
       <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
-      <api name="Atom" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/wp-app.php/service" /> 
     </apis>
   </service>
 </rsd>
@@ -595,7 +594,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			restore_current_blog();
 		}
 
-	  return $struct;
+		return $struct;
 	}