-
Committer:
Neil Martinsen-Burrell
-
Date:
2012-04-16 02:00:46 UTC
-
mfrom:
(6520 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6521.
-
Revision ID:
nmb@wartburg.edu-20120416020046-ech9tsnnrrplxoc4
resolve conflict in doc/en/release-notes/bzr-2.6.txt