From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 16 Jan 2015 15:24:25 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
X-Git-Tag: 0.9~12^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a6fdfd47ebd9d0a70fdc4babf9fe5dba59725b0f;p=telecaster-client.git

Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
---

a6fdfd47ebd9d0a70fdc4babf9fe5dba59725b0f