-
Committer:
Vincent Ladeuil
-
Date:
2014-07-17 16:18:14 UTC
-
mfrom:
(684 uci-engine)
-
mto:
This revision was merged to the branch mainline in
revision
693.
-
Revision ID:
vila+ci@canonical.com-20140717161814-n3vov25liybhit3e
Merge trunk, resolving conflicts