Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 13:41:50 +0000 (14:41 +0100)
committerMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 13:41:50 +0000 (14:41 +0100)
commit051be50aa684b46c65fb57fb8c12321bfbef5c18
tree6f23993235dad417df397575f14c7292751a1db0
parentb5c3c3e05dd4c775fef822eecb997b35081d5a0a
parent2ee87efb920392a07bc3511ecf503871997c0dbb
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django