Rev 6288: Add news entry in file:///home/vila/src/bzr/bugs/884270-merge-po/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/884270-merge-po/

------------------------------------------------------------
revno: 6288
revision-id: v.ladeuil+lp at free.fr-20111128165138-j69sd1tmoojl6orr
parent: v.ladeuil+lp at free.fr-20111128164435-lhtkqytrwfoymjzt
fixes bug: https://launchpad.net/bugs/884270
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 884270-merge-po
timestamp: Mon 2011-11-28 17:51:38 +0100
message:
  Add news entry
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-11-21 00:18:58 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-11-28 16:51:38 +0000
@@ -20,6 +20,10 @@
 
 .. New commands, options, etc that users may wish to try out.
 
+* Provides a ``po_merge`` plugin to automatically merge ``.po`` files with
+  ``msgmerge``. See ``bzr help po_merge`` for details.
+  (Vincent Ladeuil, #884270)
+
 Improvements
 ************