From: Niklas P Andersson <niklas.p.andersson@svt.se>
Date: Mon, 14 Dec 2015 13:35:42 +0000 (+0100)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into Branch_dc5575b2004ed4... 
X-Git-Tag: 2.1.0_Beta1~141
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2ef3791defe8c2314a8112cc394abe56e4741161;p=casparcg

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

2ef3791defe8c2314a8112cc394abe56e4741161