]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into next
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 14 Nov 2011 17:13:01 +0000 (18:13 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 14 Nov 2011 17:13:01 +0000 (18:13 +0100)

Trivial merge