]> git.sesse.net Git - casparcg/commitdiff
Merge pull request #138 from cambell-prince/master_parameters1
authorHellGore <helge.norberg@gmail.com>
Fri, 31 May 2013 12:18:56 +0000 (05:18 -0700)
committerHellGore <helge.norberg@gmail.com>
Fri, 31 May 2013 12:18:56 +0000 (05:18 -0700)
Rebase parameters branch on current master.


Trivial merge