From: root <root@blitz.inria.fr>
Date: Sun, 31 Oct 2010 23:08:01 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: sfa-1.0-8~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5fe5e5016647c4e579d2d936a8609956779c7e59;p=sfa.git

Merge commit 'origin/master'
---

5fe5e5016647c4e579d2d936a8609956779c7e59