[SCM] kdeclarative packaging branch, master, updated. 825b76981486c69b12cecf16333afc8f21e4635e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdeclarative.git;a=commitdiff;h=46f7401

The following commit has been merged in the master branch:
commit 46f74018a621cc9b8f66a612997c41d876ffd23e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jan 26 17:11:45 2015 +0100

    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

-- 
kdeclarative packaging