From: Guillaume Pellerin Date: Thu, 1 Dec 2011 11:34:52 +0000 (+0100) Subject: Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~41 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=43fe3e3fd4b2c65c1386db445d99ded418deeb96;p=telemeta.git Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem --- 43fe3e3fd4b2c65c1386db445d99ded418deeb96