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

Trivial merge