Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 6 Mar 2013 10:46:23 +0000 (11:46 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 6 Mar 2013 10:46:23 +0000 (11:46 +0100)
commit5f3beaa46982befb596ec6ee4e235e99c570f635
treefdc440bf60ee5e1f1e38aefdb4cda1bddbb27dfa
parent9913041d5c2f410547dc4538f2f92353eb8dc308
parent8e75238a1113421aa3aedbac7aee315ed52fb92e
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django