From: yomguy <yomguy@parisson.com>
Date: Tue, 23 Oct 2012 15:18:12 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
X-Git-Tag: 1.0~17^2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7a6753a0ec0117aed2416ab994aa2ee9ac9bc883;p=telecaster-server.git

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

7a6753a0ec0117aed2416ab994aa2ee9ac9bc883