From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 30 Mar 2016 07:00:22 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6^2~13^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=70dfe2e5857ee7de5c6d344dd574e4f1edda76e7;p=telemeta.git

Merge branch 'dev' of github.com:Parisson/Telemeta into dev
---

70dfe2e5857ee7de5c6d344dd574e4f1edda76e7