From: yomguy <yomguy@parisson.com>
Date: Fri, 20 Jul 2012 08:53:07 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.4-lam~19^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a730b5cc92f6c5a3e19f1f43b86220a26ed7a54e;p=telemeta.git

Merge branch 'dev'
---

a730b5cc92f6c5a3e19f1f43b86220a26ed7a54e