Rev 5124: (vila) Open 2.2.5 for bugfixes (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.2/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.2/

------------------------------------------------------------
revno: 5124 [merge]
revision-id: pqm at pqm.ubuntu.com-20110204152258-42fvoqaixf7b3a72
parent: pqm at pqm.ubuntu.com-20110204121411-nh6ukc1ogrucz3r4
parent: v.ladeuil+lp at free.fr-20110204140418-56whknbvj2xo3yhb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Fri 2011-02-04 15:22:58 +0000
message:
  (vila) Open 2.2.5 for bugfixes (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2011-02-04 10:54:32 +0000
+++ b/NEWS	2011-02-04 14:04:18 +0000
@@ -5,6 +5,37 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 2.2.5
+#########
+
+:Codename: Suggestions welcome
+:2.2.5: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.2.4
 #########
 

=== modified file 'bzr'
--- a/bzr	2011-01-20 21:40:17 +0000
+++ b/bzr	2011-02-04 14:04:18 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 2, 4)
+_script_version = (2, 2, 5)
 
 try:
     version_info = sys.version_info

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-02-04 10:54:32 +0000
+++ b/bzrlib/__init__.py	2011-02-04 14:04:18 +0000
@@ -52,7 +52,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (2, 2, 4, 'final', 0)
+version_info = (2, 2, 5, 'dev', 0)
 
 # API compatibility version
 api_minimum_version = (2, 2, 0)