Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Mar 2013 11:48:14 +0000 (12:48 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Mar 2013 11:48:14 +0000 (12:48 +0100)

Trivial merge