Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <aminelarabi@vis191b.sophia.inria.fr>
Tue, 12 Mar 2013 08:59:52 +0000 (09:59 +0100)
committerMohamed Larabi <aminelarabi@vis191b.sophia.inria.fr>
Tue, 12 Mar 2013 08:59:52 +0000 (09:59 +0100)

Trivial merge