Viewing all changes in revision 6323.

Committer: Patch Queue Manager
Date: 2011-11-29 11:13:07 UTC
mfrom: <a title="Merged From 6321.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6321.1.1?remember=2255.2.156">(6321.1.1 trunk)
Revision ID: pqm@pqm.ubuntu.com-20111129111307-5aj61u7nfe43cla7

(vila) Smarter .po file merging with merge hook as a plugin: po_merge
(lazy options). (Vincent Ladeuil)

added added

removed removed