From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 28 Sep 2010 08:35:36 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: sfa-1.0-2~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8f5b1806018a63c676bab171d1171bcd18ea7884;p=sfa.git

Merge remote branch 'origin/master'
---

8f5b1806018a63c676bab171d1171bcd18ea7884