From: yomguy <yomguy@parisson.com>
Date: Fri, 25 Jul 2014 07:45:44 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-client
X-Git-Tag: 0.9~14^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9d922812ab2cc02a3c922a44f68601bb1617041c;p=telecaster-client.git

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

9d922812ab2cc02a3c922a44f68601bb1617041c