Rev 6014: Move the news entry for bug #806356 in the right section. in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6014
revision-id: v.ladeuil+lp at free.fr-20110707125117-0t3cw11p75mvw1ev
parent: pqm at pqm.ubuntu.com-20110707120741-pfagsqufrv57xoe1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2011-07-07 14:51:17 +0200
message:
  Move the news entry for bug #806356 in the right section.
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-07-07 09:34:06 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-07-07 12:51:17 +0000
@@ -145,9 +145,6 @@
 * New hook set_commit_message in bzrlib.msgeditor to set a commit message
   and revision properties.  (Jonathan Riddell, #274578)
 
-* Preserve existing ``root-id`` when merging an unrelated branch.
-  (Aaron Bentley, #806356)
-
 * Support ``-S`` as an alias for ``--short`` for the ``log`` and
   ``missing`` commands. (Martin von Gagern, #38655)
 
@@ -199,6 +196,9 @@
   because ``build_mo`` became a required step that they didn't know about.
   (John Arbash Meinel, #787122)
 
+* Preserve existing ``root-id`` when merging an unrelated branch.
+  (Aaron Bentley, #806356)
+
 * Properly avoid re-adding a file after it changes case on CICP
   filesystems. (John Arbash Meinel, #798130)