Merge from trunk

1 files changed, 16 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 20c74cf70b2..8ecaf97a84a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,19 @@
+2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Merge from gnulib.
+
+2012-09-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.2.6.
+
+        * tramp.texi (Bug Reports): Cleanup caches before a test run.
+
+        * trampver.texi: Update release number.
+
+2012-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Merge from gnulib.
+
 2012-08-06  Aurélien Aptel  <aurelien.aptel@gmail.com>
 
         * url.texi (Parsed URLs): Adjust to the code's use of defstruct