[SCM] libksane packaging branch, master, updated. debian/4.12.3-2-17-gce80915

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libksane.git;a=commitdiff;h=5f333b2

The following commit has been merged in the master branch:
commit 5f333b20f376865ac5fda6c1b38e4dbfa6761399
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 20 08:42:33 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

-- 
libksane packaging