From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 12 Apr 2013 09:51:10 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
X-Git-Tag: 1.0~15^2~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eca372e908836adcb54d966c7aceb3b34683bae9;p=telecaster-server.git

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

eca372e908836adcb54d966c7aceb3b34683bae9