Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 15:35:46 +0000 (16:35 +0100)
committerMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 15:35:46 +0000 (16:35 +0100)
commit94998a0c25ab3495b11fdf1c0d970fd2ebef8a47
tree985b74bb32cafbfe367bb8ba8f7073de0e260fff
parent58f9c1be9adc583e1532ffcfd7317e16bab93c4e
parent1e75b6c2a99a775192d1af3de317d05d8d8896fa
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django