Rev 6585: Merge 2.6 into trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6585 [merge]
revision-id: v.ladeuil+lp at free.fr-20130804114553-wa14xnkw4r9ub69a
parent: pqm at pqm.ubuntu.com-20130804114054-cl62iwpn48g56m81
parent: pqm at pqm.ubuntu.com-20130804111322-629zjlc9n4sbmeok
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Sun 2013-08-04 13:45:53 +0200
message:
  Merge 2.6 into trunk
modified:
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
  doc/en/whats-new/whats-new-in-2.6.txt whatsnewin2.6.txt-20120116134316-8w1xxom1c7vcu1t5-2
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2013-07-27 12:53:28 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2013-08-04 11:45:53 +0000
@@ -5,7 +5,7 @@
 .. toctree::
    :maxdepth: 1
 
-bzr 2.6b3
+bzr 2.6.0
 #########
 
 :Codename: Surprise

=== modified file 'doc/en/whats-new/whats-new-in-2.6.txt'
--- a/doc/en/whats-new/whats-new-in-2.6.txt	2013-07-27 11:24:34 +0000
+++ b/doc/en/whats-new/whats-new-in-2.6.txt	2013-08-04 09:58:13 +0000
@@ -4,7 +4,7 @@
 
 Bazaar 2.6 has been released on the 27th of July 2013 and marks the start of
 a new long-trem stable series. From here, we will only make bugfix releases
-on the 2.6 series (2.6.1, etc)d), while 2.7 will become our new development
+on the 2.6 series (2.6.1, etc), while 2.7 will become our new development
 series.