move changes into 0.97.2 where I merged them

diff --git a/doc/ChangeLog b/doc/ChangeLog
index ee74bc985f934b0c266cf33b5ab27bb02d6856ac..2fa0f2032e86291ef1a4da37822e518e6b8fed65 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,8 +5,6 @@ ChangeLog for SemantiScuttle
 -------------------
 - Fix bug in getTagsForBookmarks() that fetched all tags
 - Fix bug #3073215: Updating bookmark time does not work
-- Fix bug #3074816: French translation breaks edit javascript
-- Fix bug #3111254: Search in my_watchlist results in error
 - Show error message on mysqli connection errors
 - Implement patch #3059829: update FR_CA translation
 - Update php-gettext library to 1.0.10
@@ -16,6 +14,8 @@ ChangeLog for SemantiScuttle
 0.97.2 - 2011-02-XX
 -------------------
 - Fix bug #3178597: Broken link to context in gsearch admin index page
+- Fix bug #3074816: French translation breaks edit javascript
+- Fix bug #3111254: Search in my_watchlist results in error
 
 
 0.97.1 - 2010-09-30