[SCM] networkmanager-qt packaging branch, master, updated. cfadfca8b95b9fd3c8aed3d148554cef24bd89e4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=ce4adc3

The following commit has been merged in the master branch:
commit ce4adc3865b8c1648709c8736933dca6f46efe56
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 21:44: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

-- 
networkmanager-qt packaging