]> git.sesse.net Git - casparcg/commitdiff
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
authorHelge Norberg <helge.norberg@svt.se>
Wed, 30 Mar 2016 19:16:02 +0000 (21:16 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Wed, 30 Mar 2016 19:16:02 +0000 (21:16 +0200)

Trivial merge