Merge branch 'master' of git.onelab.eu:/git/infrastructure
authorCiro Scognamiglio <c.scognamiglio@cslash.net>
Wed, 11 Jul 2012 15:50:18 +0000 (17:50 +0200)
committerCiro Scognamiglio <c.scognamiglio@cslash.net>
Wed, 11 Jul 2012 15:50:18 +0000 (17:50 +0200)
commitf647311ff8deeb9172d8f90447d93639a1c34f78
tree87c7c2d6571f26475c28437183036c7b031365f1
parentcf780c1f41a15b527429b7b2b0a32bf000c4a95f
parentfed301215460af8d93b173a15a3f20fbf3ad8551
Merge branch 'master' of git.onelab.eu:/git/infrastructure