-
Committer:
John Arbash Meinel
-
Date:
2011-10-06 09:50:45 UTC
-
mfrom:
(6195.1.1 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6197.
-
Revision ID:
john@arbash-meinel.com-20111006095045-c2r8uk28vf6eil9j
Merge vila's integration branch, to ensure we have the bzr-2.5b2 tag.