Rev 5648: (vila) Merge 2.2 into 2.3 resolving conflicts (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5648 [merge]
revision-id: pqm at pqm.ubuntu.com-20110517204412-wdh321at6v0w307l
parent: pqm at pqm.ubuntu.com-20110516210931-qz88t5hu3a0i7b9a
parent: v.ladeuil+lp at free.fr-20110517151438-j75xuw2zm9alk9a5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Tue 2011-05-17 20:44:12 +0000
message:
  (vila) Merge 2.2 into 2.3 resolving conflicts (Vincent Ladeuil)
modified:
  doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
=== modified file 'doc/en/release-notes/bzr-2.1.txt'
--- a/doc/en/release-notes/bzr-2.1.txt	2010-12-16 20:41:47 +0000
+++ b/doc/en/release-notes/bzr-2.1.txt	2011-05-17 15:14:38 +0000
@@ -5,10 +5,45 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.1.5
+#########
+
+:2.1.5: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.1.4
 #########
 
-:2.1.4: NOT RELEASED YET
+:2.1.4: 2011-05-16
+
+The fourth release in our 2.1 series addresses some user-inconvenience bugs.
+None are critical, but upgrading is recommended for all users on earlier 2.1
+releases.
+
 
 Compatibility Breaks
 ********************
@@ -22,6 +57,8 @@
 New Features
 ************
 
+None.
+
 Bug Fixes
 *********