]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into next
authorMarco Gittler <marco@gitma.de>
Sat, 12 Nov 2011 22:19:36 +0000 (23:19 +0100)
committerMarco Gittler <marco@gitma.de>
Sat, 12 Nov 2011 22:19:36 +0000 (23:19 +0100)

Trivial merge