From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Tue, 30 Oct 2012 07:05:15 +0000 (+0100)
Subject: Merge branch 'master' into feature/pkey
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=09194484c415d7a7645bcf7c2245cc753059ea4c;p=kdenlive

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

09194484c415d7a7645bcf7c2245cc753059ea4c