]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of ssh://git.kde.org/kdenlive
authorJean-Nicolas Artaud <jeannicolasartaud@gmail.com>
Mon, 13 Jan 2014 21:15:14 +0000 (22:15 +0100)
committerJean-Nicolas Artaud <jeannicolasartaud@gmail.com>
Mon, 13 Jan 2014 21:15:14 +0000 (22:15 +0100)

Trivial merge