-
Committer:
INADA Naoki
-
Date:
2011-05-18 06:27:34 UTC
-
mfrom:
(5887 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
5894.
-
Revision ID:
songofacandy@gmail.com-20110518062734-1ilhll0rrqyyp8um
merge from lp:bzr and resolve conflicts.