From: Baris Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Fri, 18 Jun 2010 13:19:57 +0000 (+0200)
Subject: Merge branch 'master' of git.onelab.eu:/git/infrastructure
X-Git-Tag: foo~108
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4db94323614e46588948dc644dce8a7581dce92d;p=infrastructure.git

Merge branch 'master' of git.onelab.eu:/git/infrastructure
---

4db94323614e46588948dc644dce8a7581dce92d