[SCM] kwallet-pam packaging branch, master, updated. ubuntu/4%5.4.0-0ubuntu1-9-g241ea5d

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ae42ee4db0c4f1d1b43c1975b5f3c03d546daf30
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 3 00:19:37 2015 +0200

    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

-- 
kwallet-pam packaging