Merge from origin/emacs-24

[gnu-emacs] / test / ChangeLog

diff --git a/test/ChangeLog b/test/ChangeLog
index f7bec2ee1194412540f2b388a338796047e435aa..4999576a8789c38f63a1ff3d013562e8d16ca755 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-04  Michael Albinus  <michael.albinus@gmx.de>
+
+       * automated/tramp-tests.el (tramp-test06-directory-file-name):
+       Fix docstring and last test.
+
 2015-04-01  Artur Malabarba  <bruce.connor.am@gmail.com>
 
        * automated/package-test.el: Avoid async while testing.