From: Alberto Villa <avilla@FreeBSD.org>
Date: Thu, 10 Nov 2011 00:48:51 +0000 (+0100)
Subject: Merge branch 'master' into buildsystem
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fd3954b6965b2bc81eeed9fadd40dbbf9607fa37;p=kdenlive

Merge branch 'master' into buildsystem

Conflicts:
	CMakeLists.txt
	po/CMakeLists.txt
---

fd3954b6965b2bc81eeed9fadd40dbbf9607fa37