From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 9 Apr 2011 11:50:09 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-21-ckp1~74^2~9
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d459c7527226959e962bc4442c612d1b8c60bb03

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

d459c7527226959e962bc4442c612d1b8c60bb03