From: Jordan Augé <jordan.auge@lip6.fr>
Date: Sun, 7 Oct 2012 01:08:20 +0000 (+0200)
Subject: Merge branch 'master' of git://git.onelab.eu/sfa into upmc
X-Git-Tag: sfa-2.1-23~30
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4ba188d2e00ad2ecb5d642c6c442fef500539752

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

4ba188d2e00ad2ecb5d642c6c442fef500539752