From: Ciro Scognamiglio <c.scognamiglio@cslash.net>
Date: Wed, 11 Jul 2012 15:50:18 +0000 (+0200)
Subject: Merge branch 'master' of git.onelab.eu:/git/infrastructure
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f647311ff8deeb9172d8f90447d93639a1c34f78;p=infrastructure.git

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

f647311ff8deeb9172d8f90447d93639a1c34f78