Merge branch 'master' into xwidget

1 files changed, 8 insertions, 3 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index dcce0bf3c39..d63a561953d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,7 +1,12 @@
+2015-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/cl-generic-tests.el (setf cl--generic-2): Make sure
+        the setf can be used already in the body of the method.
+
 2015-01-20  Jorgen Schaefer  <contact@jorgenschaefer.de>
 
         * automated/package-test.el (package-test-install-prioritized):
-        Removed test due to unreproducable failures.
+        Remove test due to unreproducable failures.
 
 2015-01-20  Michal Nazarewicz  <mina86@mina86.com>
 
@@ -15,8 +20,8 @@
         A new helper function for testing `tildify-double-space-undos'
         behaviour in the `tildify-space' function.
         (tildify-space-undo-test-html, tildify-space-undo-test-html-nbsp)
-        (tildify-space-undo-test-xml, tildify-space-undo-test-tex): New
-        tests for `tildify-doule-space-undos' behaviour.
+        (tildify-space-undo-test-xml, tildify-space-undo-test-tex):
+        New tests for `tildify-doule-space-undos' behaviour.
 
         * automated/tildify-tests.el (tildify-space-test--test):
         A new helper function for testing `tildify-space' function.