From: Pierre Guillou <guillou@cri.ensmp.fr>
Date: Tue, 11 Feb 2014 12:36:52 +0000 (+0100)
Subject: unwanted merge with Vivien
X-Git-Url: https://scm.cri.mines-paristech.fr/git/pipstransfo.git/commitdiff_plain/0106ef99df45720946ada6d92f8d543b94a0e0c0?ds=sidebyside;hp=0106ef99df45720946ada6d92f8d543b94a0e0c0

unwanted merge with Vivien
---