# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1254148028 0
# Node ID 0e947a4050e9cdb7690c4f1f34ac9411e85b8394
# Parent  91d13c56571ce6e3256df7e0e9e5350bcb4feaf6
*** empty log message ***

diff -r 91d13c56571c -r 0e947a4050e9 doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Mon Sep 28 14:26:45 2009 +0000
+++ b/doc/misc/ChangeLog	Mon Sep 28 14:27:08 2009 +0000
@@ -1,7 +1,20 @@
+<<<<<<< ChangeLog
+2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (History): Add IMAP support.
+	(External methods): Add `imap' and `imaps' methods.
+	(GVFS based methods): Add indices for `davs'.
+	(Password handling): Rename anchors.  Add IMAP entries for
+	~/.authinfo.gpg.
+
+	* trampver.texi: Set default value of `emacsimap'.
+
+=======
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
 	* gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
+>>>>>>> 1.320
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired-x.texi (Technical Details): Delete