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

Trivial merge