Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 4 Jun 2013 07:57:01 +0000 (09:57 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 4 Jun 2013 07:57:01 +0000 (09:57 +0200)

Trivial merge