-
Committer:
John Arbash Meinel
-
Date:
2014-04-12 06:16:14 UTC
-
mfrom:
(2248.1.24 1.18)
-
mto:
This revision was merged to the branch mainline in
revision
2619.
-
Revision ID:
john@arbash-meinel.com-20140412061614-l7npd9xs72ix5swd
merge 1.18 into trunk. Essentially a no-op bzr-metadata only merge