-
Committer:
Matteo Nastasi
-
Date:
2016-08-15 18:39:54 UTC
-
mfrom:
(960)
-
mto:
This revision was merged to the branch mainline in
revision
961.
-
Revision ID:
git-v1:5bd4aa6c88e6f5ade4f7e72571c0ed738edafe18
Merge remote-tracking branch 'origin/next' into spice-package
Conflicts:
.travis.yml