From: Helge Norberg <helge.norberg@svt.se>
Date: Tue, 12 Apr 2016 08:18:23 +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~85
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=a660f13c38fbd89c3db2169449baa5e2268db815

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

a660f13c38fbd89c3db2169449baa5e2268db815