Merge from origin/emacs-24

dd3f567 Fix tramp-tests.el

Conflicts:
	test/ChangeLog
This commit is contained in:
Paul Eggert 2015-04-04 14:58:35 -07:00
commit c1b8b17a7a

View file

@ -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.