[SCM] kwayland packaging branch, master, updated. 9bf9e2dde3b8c01fdba069a0ae90a2285cfef72f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwayland.git;a=commitdiff;h=10eddc8

The following commit has been merged in the master branch:
commit 10eddc84bd393028c1bfbf185439b7507a08d906
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 8 21:01:25 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

-- 
kwayland packaging