From: Jordan Augé <jordan.auge@lip6.fr>
Date: Sun, 9 Dec 2012 23:00:30 +0000 (+0100)
Subject: Merge branch 'master' of git://git.onelab.eu/sfa into upmc
X-Git-Tag: sfa-2.1-23~27
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=80ed4dd40141136e7568bdf0d325d72270e28ab8

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

80ed4dd40141136e7568bdf0d325d72270e28ab8