[SCM] oxygen packaging branch, master, updated. e2e40fd4a13a2c88103e27bc423ae26e420d6a72

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit eb1d274e9bf15ef2dc4698a7a33d44df07f87cee
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 8 16:20:21 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

-- 
oxygen packaging