From: root <root@cassidy.cs.princeton.edu>
Date: Mon, 29 Nov 2010 17:41:56 +0000 (-0500)
Subject: fix merge between onelab and princeton repositories
X-Git-Tag: sface-0.1-4~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=1dbdb55c8d56e3c82047dc29a6789183f76d07a7;hp=1dbdb55c8d56e3c82047dc29a6789183f76d07a7;p=sface.git

fix merge between onelab and princeton repositories
---