Rev 6098: (jr) Merge in 2.4 version in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6098 [merge]
revision-id: pqm at pqm.ubuntu.com-20110825054210-ynb198gs8dkiuv5p
parent: pqm at pqm.ubuntu.com-20110825032044-1vtgcxhsmfyjqlj7
parent: jriddell at canonical.com-20110824102020-wnkyd93ztiu1oxt2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-08-25 05:42:10 +0000
message:
  (jr) Merge in 2.4 version
   Fix i18n use when no environment variables are set. (Jelmer Vernooij,
   #810701) (Jonathan Riddell)
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-08-21 15:14:57 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-08-24 10:20:20 +0000
@@ -35,6 +35,8 @@
 * ``config.LocationMatcher`` properly excludes unrelated sections.
   (Vincent Ladeuil, #829237)
 
+* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
+
 Documentation
 *************
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-08-24 20:33:01 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-08-25 05:42:10 +0000
@@ -121,8 +121,6 @@
 * Decode ``BZR_HOME`` with fs encoding on posix platforms to avoid unicode
   errors.  (Vincent Ladeuil, #822571)
 
-* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
-
 * TreeTransformBase.fixup_new_roots no longer forces trees to have a root, so
   operations that use it, like merge, can now create trees without a root.
   (Aaron Bentley)