From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 17 Jul 2013 21:40:11 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server
X-Git-Tag: 1.0~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f374b4e22ed388ee51b641b90684d460983318e5;p=telecaster-server.git

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

f374b4e22ed388ee51b641b90684d460983318e5