Merge from origin/emacs-24

[gnu-emacs] / test / ChangeLog

diff --git a/test/ChangeLog b/test/ChangeLog
index 4e59ee0afbf614043214b2d7d6819dfc45951337..e7b8fec0ec9ab68704e07236da8b96ee304ba998 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+       * automated/python-tests.el (python-indent-electric-colon-2)
+       (python-indent-electric-colon-3): New tests.
+
+2014-12-27  João Távora  <joaotavora@gmail.com>
 2014-12-27  João Távora  <joaotavora@gmail.com>
 
        * automated/electric-tests.el (autowrapping-7): Tests for