From: yomguy <yomguy@parisson.com>
Date: Fri, 22 Jan 2016 14:41:23 +0000 (+0100)
Subject: Merge branch 'master' of git.parisson.com:git/telecaster-server
X-Git-Tag: 1.0~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6448edfd834eb14c1314069bf692905404c34cc8;p=telecaster-server.git

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

6448edfd834eb14c1314069bf692905404c34cc8