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

Trivial merge