[SCM] plasma-volume-control packaging branch, master, updated. debian/5.5.4-1-11-g354c8fa

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3bfc012a65dd1bbd6536d5452ae39858e7556368
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Apr 18 18:50:34 2016 +0200

    Add a .gitattributes file to use dpkg-mergechangelogs
---
 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-volume-control packaging