From: Guillaume Pellerin Date: Thu, 12 May 2016 15:25:56 +0000 (+0200) Subject: Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalaste... X-Git-Tag: 1.6.2^2~18^2~3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7b8f777d11d1ec09cf7faa47c39b9df95cef9640;p=telemeta.git Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalastegui-dev --- 7b8f777d11d1ec09cf7faa47c39b9df95cef9640