From 52811f2b144872127ce250501f9dba6d8825e620 Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Thu, 6 Dec 2007 20:23:24 +0000
Subject: [PATCH] Drupal 5.5

---
 CHANGELOG.txt                | 8 +++++++-
 modules/system/system.module | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 071aec2ced6c..6095e0dbf0cb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,9 @@
 // $Id$
 
-Drupal 5.5, xxxx-xx-xx
+Drupal 5.5, 2007-12-06
 ----------------------
+- fixed missing missing brackets in a query in the user module.
+- fixed taxonomy feed bug introduced by SA-2007-031
 
 Drupal 5.4, 2007-12-05
 ----------------------
@@ -106,6 +108,10 @@ Drupal 5.0, 2007-01-15
     * added nested lists generation.
     * added a self-clearing block class.
 
+Drupal 4.7.10, 2007-12-06
+-------------------------
+- fixed taxonomy feed bug introduced by SA-2007-031
+
 Drupal 4.7.9, 2007-12-05
 ------------------------
 - fixed a security issue (SQL injection), see SA-2007-031
diff --git a/modules/system/system.module b/modules/system/system.module
index 4311eac3e1d4..66a5b0c8f864 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -6,7 +6,7 @@
  * Configuration system that lets administrators modify the workings of the site.
  */
 
-define('VERSION', '5.5-dev');
+define('VERSION', '5.5');
 
 /**
  * Implementation of hook_help().