Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorAnthony Garcia <anthony.garcia@inria.fr>
Tue, 26 Nov 2013 16:06:39 +0000 (17:06 +0100)
committerAnthony Garcia <anthony.garcia@inria.fr>
Tue, 26 Nov 2013 16:06:39 +0000 (17:06 +0100)

Trivial merge