From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 May 2013 20:39:54 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
X-Git-Tag: 1.4.5~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=53bddf7ca4f937776b7a97f772a75cde5e78515c;p=telemeta.git

Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
---

53bddf7ca4f937776b7a97f772a75cde5e78515c