-
Committer:
CI Train Bot
-
Author(s):
Michi Henning
-
Date:
2016-01-07 04:36:36 UTC
-
mfrom:
(129.1.22 landing-12.15)
-
Revision ID:
ci-train-bot@canonical.com-20160107043636-xbao3rktj4uf3u0f
Merge changes from devel to trunk for landing.
Approved by: Michi Henning, PS Jenkins bot