aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorMichael Albinus2014-06-03 09:43:24 +0200
committerMichael Albinus2014-06-03 09:43:24 +0200
commita336b2eae3b52f6fba5a19cc98e780feca618115 (patch)
treedc38c5bab3b26d430d4575594cfefc9114632ecc /lisp/ChangeLog
parente7477c9f9e88fe764c29c7193614ed37ba69efa8 (diff)
downloademacs-a336b2eae3b52f6fba5a19cc98e780feca618115.tar.gz
emacs-a336b2eae3b52f6fba5a19cc98e780feca618115.zip
Fix Bug#17653.
* net/tramp.el (tramp-ssh-controlmaster-options): Improve search regexp.
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc9703db3e0..d73300523e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-06-03 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-ssh-controlmaster-options): Improve search
4 regexp. (Bug#17653)
5
12014-06-03 Glenn Morris <rgm@gnu.org> 62014-06-03 Glenn Morris <rgm@gnu.org>
2 7
3 * emacs-lisp/package.el (package-pinned-packages): Doc fix. 8 * emacs-lisp/package.el (package-pinned-packages): Doc fix.