From: root <root@blitz.inria.fr>
Date: Tue, 26 Oct 2010 20:50:05 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: sfa-1.0-8~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9474008385c225d65e05e29f0a67067d655db301;p=sfa.git

Merge commit 'origin/master'
---

9474008385c225d65e05e29f0a67067d655db301