]> git.sesse.net Git - mlt/commitdiff
Merge branch 'work' of git://github.com/gmarco/mlt
authorDan Dennedy <dan@dennedy.org>
Fri, 10 Sep 2010 05:16:28 +0000 (22:16 -0700)
committerDan Dennedy <dan@dennedy.org>
Fri, 10 Sep 2010 05:16:28 +0000 (22:16 -0700)

Trivial merge