From: yomguy <yomguy@parisson.com>
Date: Fri, 9 Nov 2012 17:33:53 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
X-Git-Tag: 1.0~17^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d5308d2d825be957c5e4d432561fbd7a391efeb5;p=telecaster-server.git

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

d5308d2d825be957c5e4d432561fbd7a391efeb5