Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 13 Feb 2013 17:51:16 +0000 (18:51 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 13 Feb 2013 17:51:16 +0000 (18:51 +0100)

Trivial merge