[SCM] kbookmarks packaging branch, master, updated. d76d889af344df2c0c0de612b350b8c34d5071b9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kbookmarks.git;a=commitdiff;h=b0cfa95

The following commit has been merged in the master branch:
commit b0cfa953d844658b4077efa03324500ede96942e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jan 29 11:01:46 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

-- 
kbookmarks packaging