[SCM] plasma-desktop packaging branch, master, updated. 3a008c7c6b669f2fd617ac895f1dc03658edceef

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit da579dd3a4c2de41388d7d30eb8efaa77541971e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 10 20:40:06 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

-- 
plasma-desktop packaging