From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Tue, 6 Nov 2012 16:20:28 +0000 (+0100)
Subject: Merge branch 'master' into feature/pkey
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6c819d9cd57a199efc99ec3f6a4a54eae9a232c0;p=kdenlive

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

6c819d9cd57a199efc99ec3f6a4a54eae9a232c0