Merge from trunk

1 files changed, 10 insertions, 2 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index a226e88d883..12238560dc9 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,6 +1,14 @@
+2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/octave.m: Remove some `fixindent' not needed any more.
+
+2010-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/octave.m: New file.
+
 2010-08-08  Ulf Jasper  <ulf.jasper@web.de>
 
-        * icalendar-testsuite.el (icalendar-testsuite-run): Added internal tests.
+        * icalendar-testsuite.el (icalendar-testsuite-run): Add internal tests.
         (icalendar-testsuite--trim, icalendar-testsuite--compare-strings)
         (icalendar-testsuite--run-internal-tests): New.
         (icalendar-testsuite--test-convert-ordinary-to-ical)
@@ -13,7 +21,7 @@
         (icalendar-testsuite--do-test-cycle): Use icalendar-testsuite--compare-strings
         (icalendar-testsuite--run-import-tests): Comment added.
         (icalendar-testsuite--run-import-tests)
-        (icalendar-testsuite--run-real-world-tests): Fixed expected results.
+        (icalendar-testsuite--run-real-world-tests): Fix expected results.
 
 2010-06-25  Chong Yidong  <cyd@stupidchicken.com>