From: Guillaume Pellerin Date: Fri, 18 Nov 2011 13:06:58 +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~49 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=98a4c32c26df1eb4f80094230df2f0ac0f1185cc;p=telemeta.git Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem --- 98a4c32c26df1eb4f80094230df2f0ac0f1185cc