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

Trivial merge