]> git.sesse.net Git - mlt/commitdiff
Merge branch 'master' of dennedy.org:git/mltframework.org/mlt
authorDan Dennedy <dan@dennedy.org>
Tue, 1 Jun 2010 01:20:24 +0000 (18:20 -0700)
committerDan Dennedy <dan@dennedy.org>
Tue, 1 Jun 2010 01:20:24 +0000 (18:20 -0700)

Trivial merge