From: yomguy <root@localhost.localdomain>
Date: Wed, 1 Dec 2010 09:33:47 +0000 (+0000)
Subject: Merge branch 'master' of ssh://momo@parisson.com/var/git/telemeta-generic
X-Git-Tag: 1.1~486^2~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cf7743c8b1856079d875e2037763db5c6074a159;p=telemeta.git

Merge branch 'master' of ssh://momo@parisson.com/var/git/telemeta-generic
---

cf7743c8b1856079d875e2037763db5c6074a159