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)

Trivial merge