Merge from trunk.

1 files changed, 39 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b4e22c506a3..1f1190b19d9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,42 @@
+2012-02-10  Leo Liu  <sdl.web@gmail.com>
+
+        * NEWS: Change condition-case-no-debug to
+        condition-case-unless-debug and split the entry in two.
+
+2012-02-08  Alex Ott  <alexott@gmail.com>
+
+        * tutorials/TUTORIAL.ru: Updated; synchronize with TUTORIAL.
+        Coding system changed to UTF-8.
+
+2012-02-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tutorials/TUTORIAL.es: Updated; synchronize with TUTORIAL.
+
+2012-02-03  Pieter Schoenmakers  <tiggr@tiggr.net>
+
+        * tutorials/TUTORIAL.nl: Updated; synchronize with TUTORIAL.
+
+2012-01-30  Chong Yidong  <cyd@gnu.org>
+
+        * tutorials/TUTORIAL: Delete a repeat sentence.
+
+2012-01-25  Mats Lidell  <mats.lidell@cag.se>
+
+        * tutorials/TUTORIAL.sv: Updated; synchronize with TUTORIAL.
+
+2012-01-21  Ognyan Kulev  <ogi@tower.3.bg>
+
+        * tutorials/TUTORIAL.bg: Updated; synchronize with TUTORIAL.
+
+2012-01-19  Werner Lemberg  <wl@gnu.org>
+
+        * tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL.
+        Minor typographical improvements.
+
+2012-01-17  Primoz PETERLIN  <primoz.peterlin@mf.uni-lj.si>
+
+        * tutorials/TUTORIAL.sl: Update.
+
 2012-01-14  Eli Zaretskii  <eliz@gnu.org>
 
         * tutorials/TUTORIAL.he: Update to follow changes to TUTORIAL in