[SCM] extra-cmake-modules packaging branch, experimental, updated. debian/1.7.0-1-5-g807e40b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=a90e0bc

The following commit has been merged in the experimental branch:
commit a90e0bc39266b9b710861c6a3805a6e79319b8ac
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 27 22:49:07 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

-- 
extra-cmake-modules packaging