]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Thu, 24 Nov 2011 21:19:35 +0000 (22:19 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Thu, 24 Nov 2011 21:19:35 +0000 (22:19 +0100)

Trivial merge