]> git.sesse.net Git - mlt/commitdiff
Merge https://github.com/pez4brian/mlt_2 into pez
authorDan Dennedy <dan@dennedy.org>
Sun, 22 Jan 2012 00:40:20 +0000 (16:40 -0800)
committerDan Dennedy <dan@dennedy.org>
Sun, 22 Jan 2012 00:40:20 +0000 (16:40 -0800)

Trivial merge