]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into next
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sat, 12 Nov 2011 19:34:02 +0000 (20:34 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sat, 12 Nov 2011 19:34:02 +0000 (20:34 +0100)

Trivial merge