From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 4 Sep 2013 09:11:28 +0000 (+0200)
Subject: Fix merge conflict: MyAccount
X-Git-Tag: myslice-0.2-1~24
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=8c8f04ea43ed69b7a81c90f456b1153a4167a72f

Fix merge conflict: MyAccount
---

8c8f04ea43ed69b7a81c90f456b1153a4167a72f