From: Helge Norberg <helge.norberg@svt.se>
Date: Mon, 8 Feb 2016 17:39:42 +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~110
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=220f122a814beae306eaf4533a54e67df41209b1;p=casparcg

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

220f122a814beae306eaf4533a54e67df41209b1