From: Guillaume Pellerin Date: Fri, 18 Nov 2011 12:56:03 +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~50 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6c2c6ec5a698c0b921518070f0872b1fdef8743d;p=telemeta.git Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem --- 6c2c6ec5a698c0b921518070f0872b1fdef8743d