From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 11 Jan 2013 10:38:51 +0000 (+0100)
Subject: Merge branch 'master' of git://git.onelab.eu/sfa into upmc
X-Git-Tag: sfa-2.1-23~26
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=5f71f573a95f737432f56ba8e27dadfa85824c34

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

5f71f573a95f737432f56ba8e27dadfa85824c34