]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 22 Jan 2012 11:08:54 +0000 (12:08 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 22 Jan 2012 11:08:54 +0000 (12:08 +0100)

Trivial merge