Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index aa53b5b99989b481d98fc50f43ca5e632f053264..38693a70f17631e88993d71079fd0d09e317fb18 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -5,6 +5,20 @@
        * refcards/sk-refcard.tex, refcards/sk-survival.tex:
        Input "utf8off", which seems to be needed.
 
+2014-04-01  Michael Albinus  <michael.albinus@gmx.de>
+
+       * NEWS: `url-handler-mode' passes operations to Tramp for some
+       protocols.
+
+2014-03-28  Tassilo Horn  <tsdh@gnu.org>
+
+       * themes/tsdh-light-theme.el (tsdh-light): Add gnus-group-* faces.
+
+2014-03-22  Glenn Morris  <rgm@gnu.org>
+
+       * CENSORSHIP, GNU, LINUX-GNU, THE-GNU-PROJECT, WHY-FREE: Replace
+       contents with pointers to www.gnu.org or emacs.info, mark obsolete.
+
 2014-03-14  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * tutorials/TUTORIAL.de: Adapt to recent changes in TUTORIAL.