]> git.sesse.net Git - casparcg/commitdiff
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
authorniklaspandersson <niklas.p.andersson@svt.se>
Wed, 14 Aug 2013 08:00:28 +0000 (10:00 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Wed, 14 Aug 2013 08:00:28 +0000 (10:00 +0200)

Trivial merge