Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 21 Dec 2012 14:40:47 +0000 (15:40 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 21 Dec 2012 14:40:47 +0000 (15:40 +0100)
commitb819c832cd3efe0a37966196430bcf3ec0aaf0cb
tree3fb9a056c802165596fa094e949cc053843f94da
parente0c4e5be0e9d0f3c4cadf40b783f16274d7788d7
parentc177439e345967fd87345458bf9d3d591d5cacb6
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django