From: yomguy <yomguy@parisson.com>
Date: Thu, 12 Jul 2012 14:50:35 +0000 (+0200)
Subject: Merge branch 'feature/telecaster' into dev
X-Git-Tag: 0.7-dev~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e19c1b0fbe810b415a61df8b0eb7ccc7ba4bef66;p=teleforma.git

Merge branch 'feature/telecaster' into dev
---

e19c1b0fbe810b415a61df8b0eb7ccc7ba4bef66