]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 27 May 2012 10:16:30 +0000 (12:16 +0200)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 27 May 2012 10:16:30 +0000 (12:16 +0200)

Trivial merge