-
Committer:
Raphael Badin
-
Date:
2013-06-18 07:46:08 UTC
-
mfrom:
(1293 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
1294.
-
Revision ID:
raphael.badin@canonical.com-20130618074608-vgi23sucefyryn1r
Merge trunk, resolve conflicts.