From: Guillaume Pellerin Date: Tue, 13 Dec 2011 14:39:59 +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~37 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=61dc9b33a75c284447616cd5bf519e254f2ec14f;p=telemeta.git Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem --- 61dc9b33a75c284447616cd5bf519e254f2ec14f