From: Helge Norberg <helge.norberg@svt.se>
Date: Thu, 3 Dec 2015 10:21:44 +0000 (+0100)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta1~150
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b0d84593fb82226ea49a1d56aa319e924cdc369a;p=casparcg

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

b0d84593fb82226ea49a1d56aa319e924cdc369a