From: Philippe Barbosa <contact@philippebarbosa.com>
Date: Wed, 23 Mar 2016 18:10:53 +0000 (+0100)
Subject: Fix conflict
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2f3223a267d362c16ae4780b35616cac22ec93a4;p=mezzo.git

Fix conflict
---

2f3223a267d362c16ae4780b35616cac22ec93a4