Rev 5130: (vila) Merge 2.1 into 2.2 resolving conflicts (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: 5130 [merge]
revision-id: pqm at pqm.ubuntu.com-20110517111941-nrx9u4z1q8laajwp
parent: pqm at pqm.ubuntu.com-20110415094604-jql1ptxinbh4zvnk
parent: v.ladeuil+lp at free.fr-20110517095758-fzmm2qmd7rjr2zm8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Tue 2011-05-17 11:19:41 +0000
message:
  (vila) Merge 2.1 into 2.2 resolving conflicts (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-03-08 21:37:08 +0000
+++ b/NEWS	2011-05-17 09:57:58 +0000
@@ -44,6 +44,36 @@
 *******
 
 
+bzr 2.1.5
+#########
+
+:2.1.5: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.2.4
 #########
 
@@ -290,7 +320,12 @@
 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
 ********************
@@ -304,6 +339,8 @@
 New Features
 ************
 
+None.
+
 Bug Fixes
 *********
 

=== modified file 'bzr'
--- a/bzr	2011-02-04 14:04:18 +0000
+++ b/bzr	2011-05-17 09:57:58 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-02-04 14:04:18 +0000
+++ b/bzrlib/__init__.py	2011-05-17 09:57:58 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 IGNORE_FILENAME = ".bzrignore"
 
 
-__copyright__ = "Copyright 2005-2010 Canonical Ltd."
+__copyright__ = "Copyright 2005-2011 Canonical Ltd."
 
 # same format as sys.version_info: "A tuple containing the five components of
 # the version number: major, minor, micro, releaselevel, and serial. All