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)
commitfb214ca95fc3d8fb37a94a3fcbdf5ab60a617049
treef4e675aa5fcbf6babc0373d2360467bfa6e7adc6
parenta6278cafd53d24f4592ac3f1603b3335f6364d8e
parentcb1243ee778aa1169b67e44a334186e23fc503df
Merge branch 'master' of ssh://git.onelab.eu/git/myslice