Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 24 Sep 2013 15:57:55 +0000 (17:57 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 24 Sep 2013 15:57:55 +0000 (17:57 +0200)

Trivial merge