From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 23 Sep 2013 14:33:41 +0000 (+0200)
Subject: Fix: merge conflict
X-Git-Tag: myslice-0.2-4~50^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=937653fd70bbf7d95bcf870e7f2b46b4a8fec486

Fix: merge conflict
---

937653fd70bbf7d95bcf870e7f2b46b4a8fec486