From: Helge Norberg <helge.norberg@svt.se>
Date: Tue, 14 Mar 2017 09:39:40 +0000 (+0100)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta2~48
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=b7aa720f705ff5c5c59616ddcb82e509ddff16e1

Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
---

b7aa720f705ff5c5c59616ddcb82e509ddff16e1