Rev 4659: Merge cleanup into description in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4659 [merge]
revision-id: v.ladeuil+lp at free.fr-20100104145900-kiji3y7tcul8lo14
parent: v.ladeuil+lp at free.fr-20100104145221-vsoov8irg9q1zpey
parent: v.ladeuil+lp at free.fr-20100104145659-hl76lelnfhicyhjy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Mon 2010-01-04 15:59:00 +0100
message:
  Merge cleanup into description
-------------- next part --------------