From: root <root@devel.pl.sophia.inria.fr>
Date: Wed, 18 Jul 2012 14:22:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'local_master/master'
X-Git-Tag: sfa-2.1-14~96^2~2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=67e01f3db0ff9ede48bcf8463af4afeb14b81312

Merge remote-tracking branch 'local_master/master'
---

67e01f3db0ff9ede48bcf8463af4afeb14b81312