[SCM] plasma-nm packaging branch, master, updated. 4f27d5c886ac71e16e822d94ea063a7be2c634b9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5c204f214d0f8babb7956ce3c85175175a07bcb4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 13 12:58:34 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-nm packaging