From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 5 Dec 2013 00:10:28 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
X-Git-Tag: 1.0~3^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a8b189e9880b39aec2e09355cfb9c401ff0d0884;p=telecaster-server.git

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

a8b189e9880b39aec2e09355cfb9c401ff0d0884