From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 4 Mar 2012 15:23:58 +0000 (+0100)
Subject: Merge branch 'alchemy'
X-Git-Tag: sfa-2.1-4~84^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0c7d82b7563382410a4023cd2d11b5596e5b3115;p=sfa.git

Merge branch 'alchemy'
---

0c7d82b7563382410a4023cd2d11b5596e5b3115