From: yomguy <yomguy@parisson.com>
Date: Fri, 9 Mar 2012 15:34:12 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-client
X-Git-Tag: 0.9~77^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=425f093879b8c9303e2079dc356c3a5913b398dd;p=telecaster-client.git

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

425f093879b8c9303e2079dc356c3a5913b398dd