Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 7 Aug 2013 15:03:38 +0000 (17:03 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 7 Aug 2013 15:03:38 +0000 (17:03 +0200)

Trivial merge