Merge lp:~vila/bzr/prepare-2.0.6 into lp:bzr/2.0

[Vincent Ladeuil]

Release 2.0.6.

Release 2.0.6.

[Martin Pool (mbp)]

+1

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-09-10 05:07:49 +0000
+++ NEWS	2010-09-17 06:09:28 +0000
@@ -9,7 +9,11 @@
 bzr 2.0.6
 #########
 
-:2.0.6: NOT RELEASED YET
+:2.0.6: 2010-09-17
+
+The sixth release in our 2.0 series addresses several user-inconvenience
+bugs.  None are critical, but upgrading is recommended for all users on
+earlier 2.0 releases.
 
 Bug Fixes
 *********

=== modified file 'bzr'
--- bzr	2010-03-23 06:55:16 +0000
+++ bzr	2010-09-17 06:09:28 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 0, 5)
+_script_version = (2, 0, 6)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py	2010-03-23 07:01:02 +0000
+++ bzrlib/__init__.py	2010-09-17 06:09:28 +0000
@@ -50,7 +50,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, 0, 5, 'final', 0)
+version_info = (2, 0, 6, 'final', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (1, 17, 0)