From: Guillaume Pellerin Date: Thu, 17 Nov 2011 12:03:31 +0000 (+0100) Subject: Merge branch 'master' of http://vcs.parisson.com/git/telemeta into crem X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~52 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9ba75a10920bea61f411bfedcb3cad09aa67124a;p=telemeta.git Merge branch 'master' of http://vcs.parisson.com/git/telemeta into crem --- 9ba75a10920bea61f411bfedcb3cad09aa67124a