From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 15 Dec 2011 08:50:54 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-6~7
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=0a9aae617f7d6ceb4e169fedc6883928dce0b7b6

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

0a9aae617f7d6ceb4e169fedc6883928dce0b7b6