From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 19 Nov 2011 20:43:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: lxcbuild~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3d85f456a525331119c29a6c1947da6df9a960be;p=build.git

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

3d85f456a525331119c29a6c1947da6df9a960be