From: Guillaume Pellerin Date: Mon, 2 Apr 2012 15:24:02 +0000 (+0200) 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~31 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1123e1e53bcf90398081360e78a6b917b59cd271;p=telemeta.git Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem --- 1123e1e53bcf90398081360e78a6b917b59cd271