[SCM] kdesignerplugin packaging branch, master, updated. e292d38d555881e49589a46ce66a2dcf65004813

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdesignerplugin.git;a=commitdiff;h=7182edc

The following commit has been merged in the master branch:
commit 7182edc4ac8f433e8ebadeb69b92c47d15f4904b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 28 08:32:40 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

-- 
kdesignerplugin packaging