]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 8 Apr 2012 21:39:04 +0000 (23:39 +0200)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 8 Apr 2012 21:39:04 +0000 (23:39 +0200)

Trivial merge