From: yomguy <yomguy@parisson.com>
Date: Thu, 20 Sep 2012 14:33:45 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.4-lam~10^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=93b31cc20053421a91e18aa25a19f643cf48dd8b;p=telemeta.git

Merge branch 'dev'
---

93b31cc20053421a91e18aa25a19f643cf48dd8b