Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorAnthony Garcia <anthony.garcia@inria.fr>
Wed, 20 Nov 2013 11:25:07 +0000 (12:25 +0100)
committerAnthony Garcia <anthony.garcia@inria.fr>
Wed, 20 Nov 2013 11:25:07 +0000 (12:25 +0100)

Trivial merge