Merge from mainline.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d08b2ee1abaf23a8129fc37bd35a1dd485f159c..5abb3b1b1bce486566b1152e77b391512b04725a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -139,6 +139,11 @@
        * epa.el (epa-read-file-name): New function.  (Bug#14510)
        (epa-decrypt-file): Make plain-file optional.  Use epa-read-file-name.
 
+2013-06-09  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
+       * vc/vc-hooks.el (vc-stay-local): Doc fix.
+
 2013-06-09  Aidan Gauland  <aidalgol@amuri.net>
 
        * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused