From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Sat, 3 Nov 2012 17:53:21 +0000 (+0100)
Subject: Merge branch 'master' into feature/pkey
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ba471399b55c3b761ccc7aa5008c25bd43cfe90b;p=kdenlive

Merge branch 'master' into feature/pkey
---

ba471399b55c3b761ccc7aa5008c25bd43cfe90b