Index: wp-includes/capabilities.php
===================================================================
--- wp-includes/capabilities.php	(revision 15354)
+++ wp-includes/capabilities.php	(working copy)
@@ -1079,7 +1079,7 @@
 function current_user_can_for_blog( $blog_id, $capability ) {
 	$current_user = wp_get_current_user();
 
-    if ( is_multisite() && is_super_admin() )
+	if ( is_multisite() && is_super_admin() )
 		return true;
 
 	if ( empty( $current_user ) )
Index: wp-includes/category-template.php
===================================================================
--- wp-includes/category-template.php	(revision 15354)
+++ wp-includes/category-template.php	(working copy)
@@ -731,9 +731,9 @@
 		break;
 	endswitch;
 
-    if ( $filter )
+	if ( $filter )
 		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
-    else
+	else
 		return $return;
 }
 
Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php	(revision 15354)
+++ wp-includes/comment-template.php	(working copy)
@@ -678,9 +678,9 @@
  * @param string $pingbacktxt The string to display for pingback type
  */
 function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
-    if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-    if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-    if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
 	$type = get_comment_type();
 	switch( $type ) {
 		case 'trackback' :
@@ -946,10 +946,10 @@
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
 	global $id, $wpcommentspopupfile, $wpcommentsjavascript;
 
-    if ( false === $zero ) $zero = __( 'No Comments' );
-    if ( false === $one ) $one = __( '1 Comment' );
-    if ( false === $more ) $more = __( '% Comments' );
-    if ( false === $none ) $none = __( 'Comments Off' );
+	if ( false === $zero ) $zero = __( 'No Comments' );
+	if ( false === $one ) $one = __( '1 Comment' );
+	if ( false === $more ) $more = __( '% Comments' );
+	if ( false === $none ) $none = __( 'Comments Off' );
 
 	$number = get_comments_number( $id );
 
Index: wp-includes/cron.php
===================================================================
--- wp-includes/cron.php	(revision 15354)
+++ wp-includes/cron.php	(working copy)
@@ -90,10 +90,10 @@
 
 	$now = time();
 
-    if ( $timestamp >= $now )
-        $timestamp = $now + $interval;
-    else
-        $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
+	if ( $timestamp >= $now )
+		$timestamp = $now + $interval;
+	else
+		$timestamp = $now + ($interval - (($now - $timestamp) % $interval));
 
 	wp_schedule_event( $timestamp, $recurrence, $hook, $args );
 }
Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php	(revision 15354)
+++ wp-includes/formatting.php	(working copy)
@@ -2826,7 +2826,7 @@
  * @since 3.0.0
  */
 function capital_P_dangit( $text ) {
-       return str_replace( 'Wordpress', 'WordPress', $text );
+	return str_replace( 'Wordpress', 'WordPress', $text );
 }
 
 ?>
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 15354)
+++ wp-includes/functions.php	(working copy)
@@ -669,7 +669,7 @@
 function delete_transient( $transient ) {
 	global $_wp_using_ext_object_cache;
 
-    do_action( 'delete_transient_' . $transient, $transient );
+	do_action( 'delete_transient_' . $transient, $transient );
 
 	if ( $_wp_using_ext_object_cache ) {
 		$result = wp_cache_delete( $transient, 'transient' );
@@ -757,7 +757,7 @@
 function set_transient( $transient, $value, $expiration = 0 ) {
 	global $_wp_using_ext_object_cache;
 
-    $value = apply_filters( 'pre_set_transient_' . $transient, $value );
+	$value = apply_filters( 'pre_set_transient_' . $transient, $value );
 
 	if ( $_wp_using_ext_object_cache ) {
 		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
@@ -3784,7 +3784,7 @@
 function set_site_transient( $transient, $value, $expiration = 0 ) {
 	global $_wp_using_ext_object_cache;
 
-    $value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
+	$value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
 
 	if ( $_wp_using_ext_object_cache ) {
 		$result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 15354)
+++ wp-includes/general-template.php	(working copy)
@@ -1542,7 +1542,7 @@
  *
  * @param string $before Optional Output before the date.
  * @param string $after Optional Output after the date.
-  */
+ */
 function the_weekday_date($before='',$after='') {
 	global $wp_locale, $post, $day, $previousweekday;
 	$the_weekday_date = '';
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 15354)
+++ wp-includes/link-template.php	(working copy)
@@ -2228,7 +2228,7 @@
  * @uses wp_get_shortlink()
  */
 function wp_shortlink_header() {
-    if ( headers_sent() )
+	if ( headers_sent() )
 		return;
 
 	$shortlink = wp_get_shortlink(0, 'query');
Index: wp-includes/post-thumbnail-template.php
===================================================================
--- wp-includes/post-thumbnail-template.php	(revision 15354)
+++ wp-includes/post-thumbnail-template.php	(working copy)
@@ -57,7 +57,7 @@
  * @param int $post_id Optional. Post ID.
  * @param string $size Optional. Image size.  Defaults to 'thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes.
-  */
+ */
 function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $attr = '' ) {
 	global $id;
 	$post_id = ( NULL === $post_id ) ? $id : $post_id;
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 15354)
+++ wp-includes/post.php	(working copy)
@@ -3505,7 +3505,7 @@
 		foreach ( $backup_sizes as $size ) {
 			$del_file = path_join( dirname($meta['file']), $size['file'] );
 			$del_file = apply_filters('wp_delete_file', $del_file);
-            @ unlink( path_join($uploadpath['basedir'], $del_file) );
+			@ unlink( path_join($uploadpath['basedir'], $del_file) );
 		}
 	}
 
@@ -3578,10 +3578,10 @@
 		if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { //Get upload directory
 			if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
 				$url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
-            elseif ( false !== strpos($file, 'wp-content/uploads') )
-                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
-            else
-                $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
+			elseif ( false !== strpos($file, 'wp-content/uploads') )
+				$url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+			else
+				$url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
 		}
 	}
 
Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php	(revision 15354)
+++ wp-includes/taxonomy.php	(working copy)
@@ -981,22 +981,22 @@
 
 	$selects = array();
 	switch ( $fields ) {
- 		case 'all':
- 			$selects = array('t.*', 'tt.*');
- 			break;
- 		case 'ids':
+		case 'all':
+			$selects = array('t.*', 'tt.*');
+			break;
+		case 'ids':
 		case 'id=>parent':
- 			$selects = array('t.term_id', 'tt.parent', 'tt.count');
- 			break;
- 		case 'names':
- 			$selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
- 			break;
- 		case 'count':
+			$selects = array('t.term_id', 'tt.parent', 'tt.count');
+			break;
+		case 'names':
+			$selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
+			break;
+		case 'count':
 			$orderby = '';
 			$order = '';
- 			$selects = array('COUNT(*)');
- 	}
-    $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
+			$selects = array('COUNT(*)');
+	}
+	$select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
 
 	$query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit";
 
Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 15354)
+++ wp-includes/user.php	(working copy)
@@ -752,11 +752,11 @@
 		$ids[] = $user_object->ID;
 	}
 
-    $metas = get_user_metavalues($ids);
+	$metas = get_user_metavalues($ids);
 
 	foreach($users as $user_object) {
 		if (isset($metas[$user_object->ID])) {
-	        _fill_single_user($user_object, $metas[$user_object->ID]);
+			_fill_single_user($user_object, $metas[$user_object->ID]);
 		}
 	}
 }
Index: wp-includes/wp-db.php
===================================================================
--- wp-includes/wp-db.php	(revision 15354)
+++ wp-includes/wp-db.php	(working copy)
@@ -790,8 +790,8 @@
 	/**
 	 * Escape data. Works on arrays.
 	 *
-     * @uses wpdb::_escape()
-     * @uses wpdb::_real_escape()
+	 * @uses wpdb::_escape()
+	 * @uses wpdb::_real_escape()
 	 * @since  2.8
 	 * @access private
 	 *