From 927de6370fbee0b842e18b2fc99ded702ac93827 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Fri, 6 Jun 2008 16:26:10 -0700
Subject: Updated NEWS and bumped version to 2.1.11rc1

---
 Mailman/Version.py | 8 ++++----
 NEWS               | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Mailman/Version.py b/Mailman/Version.py
index 3cf47886..1e4db5b9 100644
--- a/Mailman/Version.py
+++ b/Mailman/Version.py
@@ -16,7 +16,7 @@
 # USA.
 
 # Mailman version
-VERSION = '2.1.10'
+VERSION = '2.1.11rc1'
 
 # And as a hex number in the manner of PY_VERSION_HEX
 ALPHA = 0xa
@@ -28,10 +28,10 @@ FINAL = 0xf
 
 MAJOR_REV = 2
 MINOR_REV = 1
-MICRO_REV = 10
-REL_LEVEL = FINAL
+MICRO_REV = 11
+REL_LEVEL = GAMMA
 # at most 15 beta releases!
-REL_SERIAL = 0
+REL_SERIAL = 1
 
 HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) |
                (REL_LEVEL << 4)  | (REL_SERIAL << 0))
diff --git a/NEWS b/NEWS
index c7e435e3..cfd4ad95 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
 
 Here is a history of user visible changes to Mailman.
 
-2.x.xx (xx-xxx-xxxx)
+2.1.11rc1 (06-Jun-2008)
 
   New Features
 
@@ -35,6 +35,9 @@ Here is a history of user visible changes to Mailman.
     - Changed bin/update to remove .bak files erroneously left behind in
       qfiles/*/ by a 2.1.9 bug.
 
+    - Added 's' to %(listname) in templates/ia/admlogin.html and
+      templates/sl/help.txt (1682990).
+
   Miscellaneous
 
     - Brad Knowles' mailman daily status report script updated to 0.0.18.
-- 
cgit v1.2.3