From: Helge Norberg <helge.norberg@svt.se>
Date: Mon, 3 Oct 2016 14:44:09 +0000 (+0200)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta1~46
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=c0dc760a3d87b346c9f267cd9d74c67c55d3bdc3

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

c0dc760a3d87b346c9f267cd9d74c67c55d3bdc3