diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 8506810398..fbb7564642 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -3575,9 +3575,9 @@ span.imgedit-scale-warn {
   16.0 - Themes
 ------------------------------------------------------------------------------*/
 
-.theme-install-php .tablenav { 
-	height:auto; 
-} 
+.theme-install-php .tablenav {
+	height:auto;
+}
 
 table#availablethemes {
 	border-spacing: 0;
@@ -3587,10 +3587,10 @@ table#availablethemes {
 	width: 100%;
 }
 
-table#availablethemes .no-items td{ 
-	border-width:0; 
-	padding:5px; 
-} 
+table#availablethemes .no-items td{
+	border-width:0;
+	padding:5px;
+}
 
 td.available-theme {
 	vertical-align: top;
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 5db9aaf29c..0a82e29f3c 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -154,7 +154,7 @@ if ( ! empty($_REQUEST['_wp_http_referer']) ) {
 
 	if ( ! empty( $_REQUEST['paged'] ) )
 		$location = add_query_arg( 'paged', (int) $_REQUEST['paged'] );
-	
+
 	wp_redirect( $location );
 	exit;
 }
diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index bd5c546bf9..dc20adb0aa 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -198,7 +198,7 @@ class WP_List_Table {
 
 		if ( ! empty( $_REQUEST['orderby'] ) )
 			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) ) 
+		if ( ! empty( $_REQUEST['order'] ) )
 			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
 ?>
 <p class="search-box">
@@ -482,7 +482,7 @@ class WP_List_Table {
 		$current = $this->get_pagenum();
 
 		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-		
+
 		$current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url );
 
 		$page_links = array();
diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php
index 0ec8ebb61d..4893ae6690 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -152,7 +152,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
 			'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
 		);
-		
+
 		list( $columns, $hidden ) = $this->get_column_info();
 
 		$style = array();
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php
index 71bea8b403..91e1d254a1 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -66,7 +66,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 			_e( 'No items found.' );
 			return;
 		}
-		
+
 		if ( is_multisite() ) {
 			if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
 				printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) );
@@ -88,23 +88,23 @@ class WP_Themes_List_Table extends WP_List_Table {
 		// Fallthrough.
 		printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
 	}
-	
-	function tablenav( $which = 'top' ) { 
+
+	function tablenav( $which = 'top' ) {
 		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
 			return;
-		?> 
-		<div class="tablenav <?php echo $which; ?>"> 
-			<?php $this->pagination( $which ); ?> 
-		   <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" /> 
-		  <br class="clear" /> 
-		</div> 
-		<?php 
+		?>
+		<div class="tablenav <?php echo $which; ?>">
+			<?php $this->pagination( $which ); ?>
+		   <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
+		  <br class="clear" />
+		</div>
+		<?php
 	}
 
 	function display() {
 		// wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
-		<?php $this->tablenav( 'top' ); ?> 
+		<?php $this->tablenav( 'top' ); ?>
 
 		<table id="availablethemes" cellspacing="0" cellpadding="0">
 			<tbody id="the-list" class="list:themes">
@@ -112,7 +112,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 			</tbody>
 		</table>
 
-		<?php $this->tablenav( 'bottom' ); ?> 
+		<?php $this->tablenav( 'bottom' ); ?>
 <?php
 	}
 
diff --git a/wp-admin/js/edit-comments.dev.js b/wp-admin/js/edit-comments.dev.js
index fbadeba2ad..b81b397978 100644
--- a/wp-admin/js/edit-comments.dev.js
+++ b/wp-admin/js/edit-comments.dev.js
@@ -218,10 +218,10 @@ setCommentsList = function() {
 	var refillTheExtraList = function(ev) {
 		// var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
 		var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
-		
+
 		if (! args.paged)
 			args.paged = 1;
-		
+
 		if (args.paged > total_pages) {
 			return;
 		}
diff --git a/wp-admin/js/list-table.dev.js b/wp-admin/js/list-table.dev.js
index 32e9806940..134005ddee 100644
--- a/wp-admin/js/list-table.dev.js
+++ b/wp-admin/js/list-table.dev.js
@@ -29,12 +29,12 @@ window.listTable = {
 		$('select', context).each( function(){
 			var options = $('option', this),
 				anySelected = false;
-			
+
 			options.each( function(){
 				this.selected = this.defaultSelected;
 				anySelected = anySelected || this.defaultSelected;
 			});
-			
+
 			// If no options are selected within a single-select dropdown,
 			// select the first element by default.
 			if ( ! this.multiple && ! anySelected )
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 2123f80ac1..a3f84ad52b 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -145,9 +145,9 @@ function wp_admin_bar_shortlink_menu() {
 
 	if ( empty( $short ) )
 		return;
-	
+
 	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
-	
+
 	$wp_admin_bar->add_menu( array(
 		'id' => $id,
 		'title' => __( 'Shortlink' ),
diff --git a/wp-includes/class-pop3.php b/wp-includes/class-pop3.php
index e5bd5d7912..fd42b3cb12 100644
--- a/wp-includes/class-pop3.php
+++ b/wp-includes/class-pop3.php
@@ -12,7 +12,7 @@
  *
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License
- * 
+ *
  * pop3 class
  *
  * $Id$
diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index a2a3cbbf7d..549d5ecf28 100644
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -115,7 +115,7 @@ class WP_Admin_Bar {
 	function recursive_render( $id, &$menu_item ) { ?>
 		<?php
 		$is_parent =  ! empty( $menu_item['children'] );
-		
+
 		$menuclass = $is_parent ? 'menupop' : '';
 		if ( ! empty( $menu_item['meta']['class'] ) )
 			$menuclass .= ' ' . $menu_item['meta']['class'];
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 4da5410053..65ee33eaf4 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -3072,7 +3072,7 @@ function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
 
 	foreach ( $list as $key => $obj ) {
 		$matched = count( array_intersect_assoc( (array) $obj, $args ) );
-		if ( ( 'AND' == $operator && $matched == $count ) 
+		if ( ( 'AND' == $operator && $matched == $count )
 		  || ( 'OR' == $operator && $matched <= $count )
 		  || ( 'NOT' == $operator && 0 == $matched ) ) {
 			$filtered[$key] = $obj;
diff --git a/wp-includes/js/admin-bar.dev.js b/wp-includes/js/admin-bar.dev.js
index 7ff75d4388..cf13ca7271 100644
--- a/wp-includes/js/admin-bar.dev.js
+++ b/wp-includes/js/admin-bar.dev.js
@@ -53,11 +53,11 @@
 		/* remove the hover class for any objects not in the immediate element's ancestry */
 		i = q.length;
 		while ( i-- ) {
-			inA = false;	
+			inA = false;
 			ancestorLength = ancestors.length;
 			while( ancestorLength-- ) {
-				if ( ancestors[ ancestorLength ] == q[i][1] ) 
-					inA = true;	
+				if ( ancestors[ ancestorLength ] == q[i][1] )
+					inA = true;
 			}
 
 			if ( ! inA )
diff --git a/wp-includes/query.php b/wp-includes/query.php
index d97ce752a4..481dabc696 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1719,7 +1719,7 @@ class WP_Query {
 				'taxonomy' => 'category',
 				'terms' => $q['category__not_in'],
 				'operator' => 'NOT IN',
-				'include_children' => false 
+				'include_children' => false
 			);
 		}
 
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 2a1a101360..cd4b01d9ce 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -542,13 +542,13 @@ class WP_User_Query {
 	 */
 	function query() {
 		global $wpdb;
-		
+
 		if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) {
 			$this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
 		} else {
 			$this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
 		}
-		
+
 		if ( $this->query_vars['count_total'] )
 			$this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");