From: Anas Ghrab <anas.ghrab@gmail.com>
Date: Thu, 29 Jan 2015 21:40:59 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/AnasGhrab/Telemeta into dev
X-Git-Tag: 1.5.1~1^2~21^2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=45f73c9e0c7de124090b8ab6d77fe2bcc89c7235;p=telemeta.git

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

45f73c9e0c7de124090b8ab6d77fe2bcc89c7235