[SCM] khtml packaging branch, master, updated. 0da14f7eb14271f3a3ece37bd56a9b22680ecbd6

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f05f8c8c504ddb574ce7069c998e6987199d4b21
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 5 09:18:41 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

-- 
khtml packaging