Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 9 Apr 2013 06:43:35 +0000 (08:43 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 9 Apr 2013 06:43:35 +0000 (08:43 +0200)

Trivial merge