From: Antonio Ruano Cuesta <antonio@fightmetric.com>
Date: Wed, 11 Jan 2017 17:20:36 +0000 (-0500)
Subject: Merge branch '2.1.0' of https://github.com/aruanoc/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta2~103^2~1
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=cc58e432aeb71030449587d23dbb72c6b0ec23e5;p=casparcg

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

cc58e432aeb71030449587d23dbb72c6b0ec23e5