Fix: merge conflict
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 23 Sep 2013 14:33:41 +0000 (16:33 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 23 Sep 2013 14:33:41 +0000 (16:33 +0200)
1  2 
portal/accountview.py

Simple merge