-
Committer:
John Arbash Meinel
-
Date:
2011-08-10 07:38:28 UTC
-
mfrom:
(6015.9.6 2.4)
-
mto:
(6015.9.8 2.4)
-
mto:
This revision was merged to the branch mainline in
revision
6066.
-
Revision ID:
john@arbash-meinel.com-20110810073828-vcxd4knnmeec0lc1
Merge bzr/2.4@6027 to resolve release-notes conflict.