From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 14 Nov 2011 17:13:01 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e0c3f925def3b749d1f946179e18dad9449338b9;p=kdenlive

Merge branch 'master' into next
---

e0c3f925def3b749d1f946179e18dad9449338b9