Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <aminelarabi@vis067b.sophia.inria.fr>
Tue, 12 Feb 2013 14:05:25 +0000 (15:05 +0100)
committerMohamed Larabi <aminelarabi@vis067b.sophia.inria.fr>
Tue, 12 Feb 2013 14:05:25 +0000 (15:05 +0100)

Trivial merge