Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 11 Mar 2013 11:18:47 +0000 (12:18 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 11 Mar 2013 11:18:47 +0000 (12:18 +0100)
commitf9cdd5524f3b0ed94df660fab8a2dffd99a3f557
treef2318b5767dbeef85bd4b841c13ed7589e8ace5c
parent65de85f2c21eb233a46734b95c7f2eee28b35b0f
parentc01a656b95a478b4450c3ae2c1eb2fe6d73a0c04
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django