From: yomguy <yomguy@parisson.com>
Date: Thu, 20 Feb 2014 10:49:22 +0000 (+0100)
Subject: Merge branch 'lam' of git.parisson.com:git/telemeta into lam
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=84f9feecbd48580cedfa23cbc9a3962d8d31d619;p=telemeta.git

Merge branch 'lam' of git.parisson.com:git/telemeta into lam
---

84f9feecbd48580cedfa23cbc9a3962d8d31d619