-
Committer:
Daniel van Vugt
-
Date:
2014-05-05 07:31:42 UTC
-
mfrom:
(1526.2.71 development-branch)
-
Revision ID:
daniel.van.vugt@canonical.com-20140505073142-kwywjmyu5ds6q73f
Merge latest development-branch, resolve conflicts and port to the new
interfaces.