From: Guillaume Pellerin Date: Fri, 14 Nov 2014 00:15:27 +0000 (+0100) Subject: Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta into crem X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fcrem;p=telemeta.git Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta into crem --- 50b8418adf5dffe2dff548074b6fdd5fa065851e