[SCM] krunner packaging branch, master, updated. 557bdeb9ab570755b2cc4ade4c96012396d2abe2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3a0ef685413c38a3a261f1aaee1b66790f359c06
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 6 08:57:08 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

-- 
krunner packaging