From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 20 Oct 2016 08:50:37 +0000 (+0200)
Subject: Merge branch 'dev' into prestashop
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9b6cbb48ecd37ad57b283364a5a08822932ae6b6;p=mezzo.git

Merge branch 'dev' into prestashop

Conflicts:
	lib/django-prestashop
---

9b6cbb48ecd37ad57b283364a5a08822932ae6b6