From: yomguy <yomguy@parisson.com>
Date: Fri, 22 Jan 2016 14:44:45 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.0~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f797bf0c12d222b723d2136db90e1e7a785a6da1;p=telecaster-server.git

Merge branch 'dev'

Conflicts:
	tcserver/conf/usr/local/bin/telecaster-restart-full
---

f797bf0c12d222b723d2136db90e1e7a785a6da1