[SCM] blinken packaging branch, master, updated. debian/4.14.1-1-21-g1cbf876

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/blinken.git;a=commitdiff;h=7271e7f

The following commit has been merged in the master branch:
commit 7271e7f9c02011b0c98d26c2b66b55fc0fbaa214
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 16 12:48:55 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

-- 
blinken packaging