[SCM] ksshaskpass packaging branch, master, updated. 239e323e4faa7cee7ffc9ad0ff5f559f85187598

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ea1d1912d2d710f8a5efea6e928c17238ef44820
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 12 22:10:38 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

-- 
ksshaskpass packaging