From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Thu, 25 Oct 2012 21:09:17 +0000 (+0200)
Subject: Merge branch 'master' into feature/pkey
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=71e41ad0c197e2e2eb033dff7800427f64d3428f;p=kdenlive

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

71e41ad0c197e2e2eb033dff7800427f64d3428f