Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 16 Dec 2013 13:15:11 +0000 (14:15 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 16 Dec 2013 13:15:11 +0000 (14:15 +0100)
1  2 
portal/accountview.py

Simple merge