Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 14:27:23 +0000 (15:27 +0100)
committerMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 14:27:23 +0000 (15:27 +0100)

Trivial merge