[SCM] qapt packaging branch, experimental, updated. debian/1.4.0-1-68-g36e138e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=d648b54

The following commit has been merged in the experimental branch:
commit d648b547ffd5e8b54efd5d0397dd2f3833d32969
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Feb 13 22:02:19 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

-- 
qapt packaging