From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Mon, 5 Nov 2012 06:44:39 +0000 (+0100)
Subject: Merge branch 'master' into feature/pkey
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=563a57ad4786d528755a99973cf3bffbdce96bcf;p=kdenlive

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

563a57ad4786d528755a99973cf3bffbdce96bcf