]> 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>
Tue, 6 Aug 2013 07:20:24 +0000 (09:20 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Tue, 6 Aug 2013 07:20:24 +0000 (09:20 +0200)

Trivial merge