merge from upstream

1 files changed, 32 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 46dbaa0da26..7aaeb1d5ee2 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,35 @@
+2011-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
+
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Version 23.3 released.
+
+2011-02-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * notes/bugtracker (bugtracker_debbugs_url): Fix typo.
+
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * admin.el (set-version): Add msdos/sed2v2.inp.
+
+2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove no-longer needed getloadavg symbols.
+        * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
+        (LDAV_SYMBOL): Remove.
+
+2011-02-12  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
+
+2011-02-05  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-warning-buffer): New constant.
+        (bzrmerge-apply): Use it.
+        (bzrmerge): Kill any old warning buffer first.
+
 2011-02-03  Glenn Morris  <rgm@gnu.org>
 
         * bzrmerge.el (bzrmerge-buffer): New constant.