]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 4 May 2012 20:57:58 +0000 (22:57 +0200)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 4 May 2012 20:57:58 +0000 (22:57 +0200)

Trivial merge