From: Emilie <zawadzki@ircam.fr>
Date: Thu, 14 Dec 2017 14:20:37 +0000 (+0100)
Subject: merge dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=82600769b6cc8fa20a8d43d39db72345882f7058;p=mezzo.git

merge dev
---

82600769b6cc8fa20a8d43d39db72345882f7058
diff --cc lib/mezzanine-organization
index 674602bd,8c5ad697..00d0368f
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 674602bdfd36fc2ec887b367a4ee999db9a2d07f
 -Subproject commit 8c5ad697698500906e05d7ce7c793ff70d6cbb5b
++Subproject commit 00d0368f9a55ffb6069b7a45a72742daafcfad47