Viewing all changes in revision 6015.25.2.

Committer: Vincent Ladeuil
Date: 2011-08-24 08:02:23 UTC
mfrom: <a title="Merged From 6015.24.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6015.24.1?remember=1704.1.1">(6015.24.1 2.4)
mto: <a title="Merged In 6015.24.2" href="/~bzr-pqm/bzr/bzr.dev/revision/6015.24.2?remember=1704.1.1">(6015.24.2 2.4)
mto: This revision was merged to the branch mainline in revision 6100 .
Revision ID: v.ladeuil+lp@free.fr-20110824080223-ie0lfsqocwklqhal

Merge into trunk resolving conflict in release notes

added added

removed removed