[SCM] plasma-workspace-wallpapers packaging branch, master, updated. 8008b50d61459a5f468d8340dd605b3de87477e4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace-wallpapers.git;a=commitdiff;h=017a430

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

-- 
plasma-workspace-wallpapers packaging