From: Guillaume Pellerin Date: Tue, 22 Dec 2015 11:08:59 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/dev' into crem X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d301c9c7459512256681ee74b53de338fda5eeda;p=telemeta.git Merge remote-tracking branch 'origin/dev' into crem --- d301c9c7459512256681ee74b53de338fda5eeda