Merge branch 'master' of git.onelab.eu:/git/sfa
authorMohamed Larabi <mohamed.larabi@inria.fr>
Thu, 14 Mar 2013 13:21:26 +0000 (14:21 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Thu, 14 Mar 2013 13:21:26 +0000 (14:21 +0100)

Trivial merge