From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 17 Dec 2013 17:20:41 +0000 (+0100)
Subject: Merge branch 'crem2' of git+ssh://vcs.parisson.com/var/git/telemeta into crem2
X-Git-Tag: 1.5.0rc3~32
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=068865f64bf36a4acceb44686780768a29183277;p=telemeta.git

Merge branch 'crem2' of git+ssh://vcs.parisson.com/var/git/telemeta into crem2
---

068865f64bf36a4acceb44686780768a29183277