Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 23 Sep 2013 14:46:43 +0000 (16:46 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 23 Sep 2013 14:46:43 +0000 (16:46 +0200)

Trivial merge