Merge from trunk

1 files changed, 26 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b40fc71708f..7069d0b9ecb 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,29 @@
+2010-09-11  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.bash, emacs.csh, ms-kermit: Remove obsolete files (use
+        emacsclient -a instead of the first two).
+
+2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * NEWS: Mention the new libxml2 functions.
+
+2010-08-25  Kenichi Handa  <handa@m17n.org>
+
+        * HELLO: Change designation sequences for Arabic text.
+
+2010-08-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: dbus.el supports alternative buses.
+
+2010-08-22  Alex Harsanyi  <harsanyi@mac.com>  (tiny change)
+
+        * emacs3.py: Import imp module and use it (Bug#5756).
+
+2010-08-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * tutorials/TUTORIAL.he: Use MAQAF instead of hyphen where appropriate.
+        Fix a few typos.
+
 2010-08-08  Ken Brown  <kbrown@cornell.edu>
 
         * PROBLEMS: Mention problem with Cygwin 1.5.19.