]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into bugfix/jogshuttle
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Mon, 19 Nov 2012 17:36:22 +0000 (18:36 +0100)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Mon, 19 Nov 2012 17:36:22 +0000 (18:36 +0100)

Trivial merge