From: yomguy <yomguy@parisson.com>
Date: Sun, 5 Aug 2012 16:06:24 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.8.5~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=301587f9ec9136aa7b657ef3c724654b301f1403;p=teleforma.git

Merge branch 'dev'
---

301587f9ec9136aa7b657ef3c724654b301f1403