From: yomguy <yomguy@parisson.com>
Date: Wed, 18 Jul 2012 13:40:49 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
X-Git-Tag: 1.4.4-lam~19^2~1^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7ce214bac1ab81f8e8e1a0d46074c174ef9b80b7;p=telemeta.git

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

7ce214bac1ab81f8e8e1a0d46074c174ef9b80b7