From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sun, 20 Nov 2011 17:08:08 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=447f053c9b82a12c8854b3f46eca50ca39fcb932;hp=51a5213eaf67eb4d674c340f80e2fb8ac0bab8b2;p=kdenlive

Merge branch 'master' into next
---