]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into effectstack
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 30 Mar 2012 00:24:45 +0000 (02:24 +0200)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 30 Mar 2012 00:24:45 +0000 (02:24 +0200)

Trivial merge