From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Thu, 22 Nov 2012 10:17:18 +0000 (+0100)
Subject: Merge branch 'master' into bugfix/jogshuttle
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=27bd91107e757db52b4b9b00ef0b8f262839043d;p=kdenlive

Merge branch 'master' into bugfix/jogshuttle
---

27bd91107e757db52b4b9b00ef0b8f262839043d