Viewing all changes in revision 5345.5.13.

Committer: Vincent Ladeuil
Date: 2010-08-28 19:50:41 UTC
mfrom: <a title="Merged From 5345.2.9" href="/~bzr-pqm/bzr/bzr.dev/revision/5345.2.9?remember=6523.2.1">(5345.2.9 simplify-test-config-building)
mto: <a title="Merged In 5345.1.26" href="/~bzr-pqm/bzr/bzr.dev/revision/5345.1.26?remember=6523.2.1">(5345.1.26 remove-gratuitous-ensure-config-dir-exist-calls)
mto: This revision was merged to the branch mainline in revision 5395 .
Revision ID: v.ladeuil+lp@free.fr-20100828195041-zary73f5fgnqb5cd

Merge simplify-test-config-building into lockable-config-files resolving conflicts

added added

removed removed