-
Committer:
Michi Henning
-
Date:
2015-02-25 05:20:57 UTC
-
mfrom:
(163.386.1 devel)
-
mto:
(163.386.2 devel)
-
mto:
This revision was merged to the branch mainline in
revision
324.
-
Revision ID:
michi.henning@canonical.com-20150225052057-9p21sge1myzaowcb
Merged devel and resolved conflicts.