From: Marco Yuen <marcoy@gmail.com>
Date: Mon, 1 Oct 2012 13:24:10 +0000 (-0400)
Subject: Merge branch 'plcapi-nova' of ssh://git.planet-lab.org/git/plcapi into plcapi-nova
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=970ca731c8e6d0266d62f86fb2f205131684b21a;p=plcapi.git

Merge branch 'plcapi-nova' of ssh://git.planet-lab.org/git/plcapi into plcapi-nova
---

970ca731c8e6d0266d62f86fb2f205131684b21a