[SCM] user-manager packaging branch, master, updated. 31a9c75c83585ea4169655004a799939a59d806d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/user-manager.git;a=commitdiff;h=51cde47

The following commit has been merged in the master branch:
commit 51cde47e00d8e5d6866d87f6fae5643e11638f63
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 13 14:48:48 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

-- 
user-manager packaging