diff -r f507feede89a -r 09a1c134465b web/wp-includes/pomo/entry.php
--- a/web/wp-includes/pomo/entry.php	Wed Dec 19 12:35:13 2012 -0800
+++ b/web/wp-includes/pomo/entry.php	Wed Dec 19 17:46:52 2012 -0800
@@ -2,7 +2,7 @@
 /**
  * Contains Translation_Entry class
  *
- * @version $Id: entry.php 621 2011-06-13 12:21:50Z nbachiyski $
+ * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
  * @package pomo
  * @subpackage entry
  */
@@ -65,14 +65,14 @@
 		// prepend context and EOT, like in MO files
 		return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
 	}
-	
+
 	function merge_with(&$other) {
 		$this->flags = array_unique( array_merge( $this->flags, $other->flags ) );
 		$this->references = array_unique( array_merge( $this->references, $other->references ) );
 		if ( $this->extracted_comments != $other->extracted_comments ) {
 			$this->extracted_comments .= $other->extracted_comments;
 		}
-		
+
 	}
 }
 endif;
\ No newline at end of file