From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Wed, 26 Sep 2012 13:43:47 +0000 (+0200)
Subject: Merge branch 'master' of git.onelab.eu:/git/sfa
X-Git-Tag: sfa-2.1-16~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=830e76ff8db249676acbcefcffb442feba66bf2a;p=sfa.git

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

830e76ff8db249676acbcefcffb442feba66bf2a