[SCM] kmenuedit packaging branch, master, updated. 76bf90255fd43aa492a82487941c2b546958761a

[Maximiliano Curia]

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

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

-- 
kmenuedit packaging