]> git.sesse.net Git - mlt/commitdiff
Merge remote-tracking branch 'original/master'
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Thu, 31 May 2012 06:24:22 +0000 (08:24 +0200)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Thu, 31 May 2012 06:24:22 +0000 (08:24 +0200)

Trivial merge