[SCM] prison packaging branch, master, updated. a98fdcaf44fdffd3863d513a3bc0b9ddd1ce6492

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/prison.git;a=commitdiff;h=a98fdca

The following commit has been merged in the master branch:
commit a98fdcaf44fdffd3863d513a3bc0b9ddd1ce6492
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Apr 18 19:30:46 2016 +0200

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

-- 
prison packaging