]> git.sesse.net Git - mlt/commitdiff
Merge branch 'master' of git://github.com/pez4brian/mlt into pez
authorDan Dennedy <dan@dennedy.org>
Sat, 8 Oct 2011 17:52:08 +0000 (10:52 -0700)
committerDan Dennedy <dan@dennedy.org>
Sat, 8 Oct 2011 17:52:08 +0000 (10:52 -0700)

Trivial merge