Merge branch 'plcapi-nova' of ssh://git.planet-lab.org/git/plcapi into plcapi-nova
authorMarco Yuen <marcoy@gmail.com>
Mon, 1 Oct 2012 13:24:10 +0000 (09:24 -0400)
committerMarco Yuen <marcoy@gmail.com>
Mon, 1 Oct 2012 13:24:10 +0000 (09:24 -0400)
commit970ca731c8e6d0266d62f86fb2f205131684b21a
treece2f9d3b7aae8b0f56728c824f259897336e1278
parenta726c8260e6da507a165a1f58cf4f50e4aa61a35
parent58dd3e9ef25573bef4c0562301a3dfe641f12a1f
Merge branch 'plcapi-nova' of ssh://git.planet-lab.org/git/plcapi into plcapi-nova