[Emacs-diffs] master c1b8b17 2/4: Merge from origin/emacs-24

[Paul Eggert]

branch: master
commit c1b8b17a7ac22123fe8d2d647265f19d2cc92625
Merge: 4839549 dd3f567
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-24
    
    dd3f567 Fix tramp-tests.el
    
    Conflicts:
        test/ChangeLog
---
 test/ChangeLog |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/test/ChangeLog b/test/ChangeLog
index f7bec2e..4999576 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-04  Michael Albinus  <address@hidden>
+
+       * automated/tramp-tests.el (tramp-test06-directory-file-name):
+       Fix docstring and last test.
+
 2015-04-01  Artur Malabarba  <address@hidden>
 
        * automated/package-test.el: Avoid async while testing.