From: Ciro Scognamiglio <c.scognamiglio@cslash.net>
Date: Fri, 13 Jul 2012 12:07:09 +0000 (+0200)
Subject: Merge branch 'master' of git.onelab.eu:/git/infrastructure
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=104ae6bb6c4e5b6243a6158d6fda70033c6b2ee7;p=infrastructure.git

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

104ae6bb6c4e5b6243a6158d6fda70033c6b2ee7