From: Jean-Nicolas Artaud <jeannicolasartaud@gmail.com>
Date: Mon, 13 Jan 2014 21:15:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.kde.org/kdenlive
X-Git-Url: https://git.sesse.net/?p=kdenlive;a=commitdiff_plain;h=87c20d036a2c530ea66bf6f00769073476879f28

Merge branch 'master' of ssh://git.kde.org/kdenlive
---

87c20d036a2c530ea66bf6f00769073476879f28