From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 6 Nov 2012 21:48:00 +0000 (+0100)
Subject: Merge branch 'master' of git://git.onelab.eu/sfa into upmc
X-Git-Tag: sfa-2.1-23~29
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=43c4f89c59b5c977bf8ee77b7817c14dc6349bc3

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

43c4f89c59b5c977bf8ee77b7817c14dc6349bc3