]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 14 Jan 2013 10:42:58 +0000 (11:42 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 14 Jan 2013 10:42:58 +0000 (11:42 +0100)

Trivial merge