Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 31 Jan 2014 10:07:23 +0000 (11:07 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 31 Jan 2014 10:07:23 +0000 (11:07 +0100)
1  2 
portal/actions.py

Simple merge