From: yomguy <yomguy@localhost.localdomain>
Date: Fri, 26 Nov 2010 01:00:42 +0000 (+0000)
Subject: Merge branch 'master' of ssh://momo@parisson.com/var/git/telemeta-generic
X-Git-Tag: 1.1~486^2~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fccf756ff0c5728afc55c14decf83e359aa98940;p=telemeta.git

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

fccf756ff0c5728afc55c14decf83e359aa98940