From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 13 Jan 2014 14:51:56 +0000 (+0100)
Subject: Merge branch 'master' of git.parisson.com:git/telecaster-server
X-Git-Tag: 1.0~3^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=79f0ff077822f666471f83f4c4aa18c67e7a454b;p=telecaster-server.git

Merge branch 'master' of git.parisson.com:git/telecaster-server
---

79f0ff077822f666471f83f4c4aa18c67e7a454b