Viewing all changes in revision 5345.5.11.

Committer: Vincent Ladeuil
Date: 2010-08-24 08:10:06 UTC
mfrom: <a title="Merged From 5345.2.8" href="/~bzr-pqm/bzr/bzr.dev/revision/5345.2.8?remember=5345.1.25">(5345.2.8 simplify-test-config-building)
mto: <a title="Merged In 5345.1.25" href="/~bzr-pqm/bzr/bzr.dev/revision/5345.1.25?remember=5345.1.25">(5345.1.25 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-20100824081006-8bqbtcdoyx0kvfwr

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

added added

removed removed