-
Committer:
Daniel van Vugt
-
Date:
2015-04-28 07:54:10 UTC
-
mfrom:
(2517 development-branch)
-
mto:
This revision was merged to the branch mainline in
revision
2673.
-
Revision ID:
daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.