[SCM] sddm packaging branch, master, updated. ccd6f2fc514466799fda2ca7e845f2ec951f11b6

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=ccd6f2f

The following commit has been merged in the master branch:
commit ccd6f2fc514466799fda2ca7e845f2ec951f11b6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Oct 17 13:32:26 2014 +0200

    Add configuration for dpkg-mergechangelogs
---
 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

-- 
sddm packaging