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

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

8ddbcd4eb887ff2859c5420264a803a986cea14a