]> git.sesse.net Git - mlt/commitdiff
Merge branch 'master' of xtremedia:git/mltframework.org/mlt
authorDan Dennedy <dan@dennedy.org>
Mon, 4 Apr 2011 23:48:14 +0000 (16:48 -0700)
committerDan Dennedy <dan@dennedy.org>
Mon, 4 Apr 2011 23:48:14 +0000 (16:48 -0700)

Trivial merge