]> git.sesse.net Git - casparcg/commitdiff
Merge remote-tracking branch 'CasparCG/2.1.0' into 2.1.0
authorJames Wise <james.wise@bluefish444.com>
Wed, 8 Feb 2017 23:23:30 +0000 (10:23 +1100)
committerJames Wise <james.wise@bluefish444.com>
Wed, 8 Feb 2017 23:23:30 +0000 (10:23 +1100)

Trivial merge