Merge from mainline.

1 files changed, 6 insertions, 4 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0e0d9f2e0d2..e8b2d571ebd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+2011-01-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Update copyright notes to match recent gnulib-related changes.
         * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
@@ -9,6 +9,11 @@
         subsumed by m4/*.m4 rule).  config.guess, config.sub, and
         doc/man/texinfo.tex are now copied in from gnulib.
 
+2011-01-14  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el: Require cl when compiling.
+        (bzrmerge-merges): Doc fix.
+
 2011-01-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         * notes/copyright: There's only one install-sh, not two, so fix a
@@ -1000,7 +1005,6 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
@@ -1020,5 +1024,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a