From: Ted Zlatanov <tzz@lifelogs.com>
Date: Wed, 17 Dec 2014 21:35:07 +0000 (-0500)
Subject: Add missing ChangeLog entry for prior commit.
X-Git-Tag: emacs-25.0.90~2635^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2c489badd31fcb25b0a34418cd4e02f4239f1a1;p=emacs.git

Add missing ChangeLog entry for prior commit.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39f09f46c09..a5672e52bdb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* net/tramp-sh.el (tramp-histfile-override): New variable.
+	(tramp-open-shell, tramp-maybe-open-connection): Use it.
+
 2014-12-17  Dmitry Gutov  <dgutov@yandex.ru>
 
 	* vc/vc.el: Improve `dir-status-files' description.