Rev 6100: (vila) Merge 2.4 into trunk resolving conflicts (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 6100 [merge]
revision-id: pqm at pqm.ubuntu.com-20110825103314-h70ju19dco9937aa
parent: pqm at pqm.ubuntu.com-20110825075137-9h77a9wtrnh14hkc
parent: v.ladeuil+lp at free.fr-20110824143901-h5dazndqo9hva99h
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-08-25 10:33:14 +0000
message:
  (vila) Merge 2.4 into trunk resolving conflicts (Vincent Ladeuil)
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-08-24 10:20:20 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-08-25 10:33:14 +0000
@@ -35,6 +35,9 @@
 * ``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