Rev 6041: (jelmer) Move NEWS entry for file-relative-url branch from bzr-2.4.txt to in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 6041 [merge]
revision-id: pqm at pqm.ubuntu.com-20110723130103-2ai1c51q6yismb7h
parent: pqm at pqm.ubuntu.com-20110723120944-iot2mt9eu8qmbibo
parent: jelmer at samba.org-20110723113526-2padfx2phylwi5e9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2011-07-23 13:01:03 +0000
message:
  (jelmer) Move NEWS entry for file-relative-url branch from bzr-2.4.txt to
   bzr-2.5.txt. (Jelmer Vernooij)
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-07-22 11:05:08 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-07-23 11:35:26 +0000
@@ -20,9 +20,6 @@
 
 .. New commands, options, etc that users may wish to try out.
 
-* Relative local paths can now be specified in URL syntax by using the "file:" prefix.
-  (Jelmer Vernooij)
-
 Improvements
 ************
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-07-22 14:11:10 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-07-23 13:01:03 +0000
@@ -53,6 +53,9 @@
   while --match-message, --match-author, --match-committer and
   --match-bugs match each of those fields.
 
+* Relative local paths can now be specified in URL syntax by using the
+  "file:" prefix.  (Jelmer Vernooij)
+
 Improvements
 ************