From: yomguy <yomguy@parisson.com>
Date: Mon, 14 Jan 2013 16:48:14 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
X-Git-Tag: 1.4.5~50^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9fa0b510fa50573973be77a0b26814ec7c80a824;p=telemeta.git

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

9fa0b510fa50573973be77a0b26814ec7c80a824