Merge from origin/emacs-24

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

Conflicts:
	lisp/ChangeLog

lisp/ChangeLog

@@ -4,6 +4,13 @@
 	arg MARKER.
 	(tramp-get-remote-path): Use it.
 
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-sh.el (tramp-send-command-and-read): New optional
+	arg MARKER.
+	(tramp-get-remote-path): Use it.
+
 2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-error-with-buffer): Call `message' properly.