Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 8 Oct 2013 12:39:06 +0000 (14:39 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 8 Oct 2013 12:39:06 +0000 (14:39 +0200)

Trivial merge