From: Guillaume Pellerin Date: Wed, 1 Dec 2010 09:28:56 +0000 (+0100) Subject: Merge branch 'master' of ssh://parisson.com/var/git/telemeta-generic X-Git-Tag: 1.1~486^2~13^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9cf57b1057ac2a0de9d76349ce2186740fe1e5bd;p=telemeta.git Merge branch 'master' of ssh://parisson.com/var/git/telemeta-generic --- 9cf57b1057ac2a0de9d76349ce2186740fe1e5bd