From: Helge Norberg <helge.norberg@svt.se>
Date: Fri, 19 Aug 2016 15:22:06 +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~64
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c471e87cfc402308a0439642766d10a3b3dc4b20;hp=-c;p=casparcg

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

c471e87cfc402308a0439642766d10a3b3dc4b20