[SCM] kcm-touchpad packaging branch, master, updated. fb612158ab9285fbb41d5a3dd573f3559fa4d95c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a3043d8af09f40d720362973dfea64dd9ab728d2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Feb 7 15:28:41 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

-- 
kcm-touchpad packaging