From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Fri, 4 May 2012 20:57:58 +0000 (+0200)
Subject: Merge branch 'master' of git://anongit.kde.org/kdenlive
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=768329495eb6da87c1b73b8ef5347d04f8fb92c2;p=kdenlive

Merge branch 'master' of git://anongit.kde.org/kdenlive
---

768329495eb6da87c1b73b8ef5347d04f8fb92c2