[SCM] powerdevil packaging branch, master, updated. 2a12d479335db0c2759d572e8712e0c4d022ac12

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/powerdevil.git;a=commitdiff;h=7f02ffd

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

-- 
powerdevil packaging