merge trunk

1 files changed, 11 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4da85943b7f..2178df6caf0 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+2012-01-19  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the
+        "skip?" question, since there can be multiple such for any revision.
+
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as
+        updated and checked.
+
 2011-11-26  Andreas Schwab  <schwab@linux-m68k.org>
 
         * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
@@ -1226,7 +1236,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.