From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 28 Sep 2012 00:40:56 +0000 (-0400)
Subject: Merge commit 'origin/plcapi-nova' into plcapi-nova
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ee926159735aa14c116e9c1f1f447ac9466c1532;p=plcapi.git

Merge commit 'origin/plcapi-nova' into plcapi-nova
---

ee926159735aa14c116e9c1f1f447ac9466c1532