]> git.sesse.net Git - mlt/commitdiff
Merge branch 'master' of dennedy.org:git/mltframework.org/mlt
authorDan Dennedy <dan@dennedy.org>
Sun, 29 May 2011 18:26:39 +0000 (11:26 -0700)
committerDan Dennedy <dan@dennedy.org>
Sun, 29 May 2011 18:26:39 +0000 (11:26 -0700)

Trivial merge