Merge from trunk and resolve conflicts.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 6eda101c815..508a2a9dd4c 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -19171,7 +19171,7 @@
         * coding.c (code_convert_region_unwind):
         Set Vlast_coding_system_used to the argument.
         (code_convert_region): If post-read-conversion function changed
-        the value of last-coding-sytem, keep the new value in
+        the value of last-coding-system, keep the new value in
         coding->symbol so that it won't be overridden.
         (run_pre_post_conversion_on_str): Likewise.
         (coding_system_accept_latin_extra_p): New function.
@@ -27912,7 +27912,7 @@ See ChangeLog.9 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001-2012 Free Software Foundation, Inc.
+    Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.