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

Trivial merge