[SCM] extra-cmake-modules packaging branch, master, updated. 2af8c69bdeb8cddd27c15b7128e0e88bcd440cd4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e7d232ed08bb255b660d0b4e7575486b0c921f0c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Aug 7 17:14:12 2014 +0200

    Add a .gitattributes file
---
 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