From: yomguy <yomguy@parisson.com>
Date: Wed, 30 Jan 2013 11:28:12 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
X-Git-Tag: 0.9~32
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c9688f3d7a58c499ebb5f071fd4821aa9106f11f;p=telecaster-client.git

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

c9688f3d7a58c499ebb5f071fd4821aa9106f11f