[SCM] kdenlive packaging branch, master, updated. 9f550ac28d3e70cb6e0992fdea79b6c2f9777920

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=d2090d3

The following commit has been merged in the master branch:
commit d2090d31ff8ae69e5a86aea99156b1b9e091fec9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 9 10:11:49 2015 +0200

    Add gitattributes to merge changelog with dpkg-mergechangelog
---
 debian/.gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs

-- 
kdenlive packaging