From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 10 Jul 2019 14:09:16 +0000 (+0200)
Subject: Merge branch 'kdenlive' of git.parisson.com:git/telemeta into kdenlive
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=148726dd1dd92d543efe461b8c96edfcf429c3d8;p=telemeta.git

Merge branch 'kdenlive' of git.parisson.com:git/telemeta into kdenlive

Conflicts:
	telemeta/util/kdenlive/session.py
---

148726dd1dd92d543efe461b8c96edfcf429c3d8