From: Raouf Benmansour <rbenmansour@iut.univ-paris8.fr>
Date: Thu, 17 Dec 2015 11:10:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into feature/haystack
X-Git-Tag: 1.6b~5^2~4^2~5^2^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e357e644adfd59a21f31fde72a373c2153ab4cbc;p=telemeta.git

Merge remote-tracking branch 'origin/master' into feature/haystack
---

e357e644adfd59a21f31fde72a373c2153ab4cbc