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)

Trivial merge