]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-24
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:16:44 +0000 (13:16 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:16:44 +0000 (13:16 -0300)
commit6e66744d4c4bd94bb7e34f4243de0213334a31c5
tree31e2119174abef42d4306278958c967938a5275e
parentcd1ed48ddbbb487a40bbf2ecc55ca1d8377c1819
parent230c010050f424cee81c3bcf00b0f00a65819dcb
Merge from origin/emacs-24

230c010 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.

Conflicts:
lisp/ChangeLog
lisp/ChangeLog