Rev 6094: Merge 2.4 into trunk resolving conflicts in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6094 [merge]
revision-id: v.ladeuil+lp at free.fr-20110824143901-h5dazndqo9hva99h
parent: pqm at pqm.ubuntu.com-20110823131455-25rwamcvm0il00ps
parent: pqm at pqm.ubuntu.com-20110824141634-e0mk34gej3pitt54
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Wed 2011-08-24 16:39:01 +0200
message:
  Merge 2.4 into trunk resolving conflicts
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------
=== 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 14:39:01 +0000
@@ -35,6 +35,11 @@
 * ``config.LocationMatcher`` properly excludes unrelated sections.
   (Vincent Ladeuil, #829237)
 
+* ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
+  disabled. (Vincent Ladeuil, #824513)
+
+* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
+
 Documentation
 *************