[SCM] plasma-nm packaging branch, master, updated. debian/0.9.3.3-4-7-g0f60115

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 216e6a765370130b80628dc45539dd5120f1f537
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Aug 14 15:02:05 2014 +0200

    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-nm packaging