]> git.sesse.net Git - mlt/commitdiff
Merge branch 'master' of https://github.com/mltframework/mlt
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 19 Nov 2012 16:16:50 +0000 (17:16 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 19 Nov 2012 16:16:50 +0000 (17:16 +0100)

Trivial merge