Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 17 Sep 2013 09:46:21 +0000 (11:46 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 17 Sep 2013 09:46:21 +0000 (11:46 +0200)

Trivial merge