Rev 5856: Merge 2.3.3 to trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 5856 [merge]
revision-id: v.ladeuil+lp at free.fr-20110513131127-w47a142m41zss93u
parent: v.ladeuil+lp at free.fr-20110513125105-nfqzhavkffbzatjj
parent: v.ladeuil+lp at free.fr-20110513125129-dnztgrp4df8ufsue
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2011-05-13 15:11:27 +0200
message:
  Merge 2.3.3 to trunk
modified:
  doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
-------------- next part --------------
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt	2011-05-13 12:51:05 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt	2011-05-13 13:11:27 +0000
@@ -20,7 +20,10 @@
 Bazaar 2.3.1 includes all the fixes in the un-released 2.0.7, 2.1.4 and 2.2.5
 versions that weren't included in 2.3.0 and fixes some bugs on its own.
 
-Bazaar 2.3.2 is a bugfix release.
+Bazaar 2.3.2 is a bugfix release that was never released.
+
+Bazaar 2.3.3 is a bugfix release including the fixes in 2.3.2 and
+fixing the test helpers deprecated by python-2.7.
 
 See the :doc:`../release-notes/index` for details.