From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 23 May 2011 14:26:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sface
X-Git-Tag: sface-0.1-11~4
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=1790ec67340d64652164e895f1c7620580b40019

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

1790ec67340d64652164e895f1c7620580b40019