Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 14:27:23 +0000 (15:27 +0100)
committerMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 14:27:23 +0000 (15:27 +0100)
commitc177439e345967fd87345458bf9d3d591d5cacb6
tree0a7a9e6d32af2994ed56a8dec0137fc826b2a40f
parent2c36863ddbaf0c0b8d17a25131bd2f5f1c9b7b05
parent103973385ddb3a0bc77ef746c8d65b5a25634070
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django