From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 27 Nov 2012 10:52:16 +0000 (+0100)
Subject: Merge branch 'master' of git://git.onelab.eu/sfa into upmc
X-Git-Tag: sfa-2.1-23~28
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8ece6aaf557800371b7366e22af7a6ab04614d10

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

8ece6aaf557800371b7366e22af7a6ab04614d10