From: Guillaume Pellerin Date: Fri, 18 Nov 2011 14:01:09 +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~47 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4b9d20fc07f7795dfd174c0f2a6c090ea86e3d58;p=telemeta.git Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem --- 4b9d20fc07f7795dfd174c0f2a6c090ea86e3d58