1 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d00a180e9c..776c6600694 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,12 @@
-2014-07-28  Eli Zaretskii  <eliz@gnu.org>
+2014-07-28  Emilio C. Lopes  <eclig@gmx.net>
+
+        * net/tramp-sh.el (tramp-get-remote-python): Also search for
+        executables named "python2" or "python3".
+        (tramp-get-remote-uid-with-python): Use parentheses around
+        arguments to `print' to make it compatible with Python 3.
+        (tramp-get-remote-gid-with-python): Ditto.  (Bug#18118)
+
+22014-07-28  Eli Zaretskii  <eliz@gnu.org>
 
         * window.el (window--pixel-to-total): Use FRAME's root window, not
         that of the selected frame.  (Bug#18112, Bug#16674)