]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 8 Jan 2012 14:00:38 +0000 (15:00 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 8 Jan 2012 14:00:38 +0000 (15:00 +0100)

Trivial merge