Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorAnthony Garcia <anthony.garcia@inria.fr>
Wed, 16 Oct 2013 16:34:58 +0000 (18:34 +0200)
committerAnthony Garcia <anthony.garcia@inria.fr>
Wed, 16 Oct 2013 16:34:58 +0000 (18:34 +0200)

Trivial merge