Merge branch 'master' of git.onelab.eu:/git/myslice myslice-0.2-4
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 16:35:11 +0000 (18:35 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 16:35:11 +0000 (18:35 +0200)
commitc6bb9886f7fa0a6e804eb46b5fbb6479bae14b36
tree5f6e2d13d2cc5a782d242fd0a32dc695069ab0eb
parent42b767c30e4fa2b6e66ea37ba0435f4cae2aaf20
parentddf0f334a01046d2e1f9a40ae757a2fbfafa4853
Merge branch 'master' of git.onelab.eu:/git/myslice