[SCM] kplotting packaging branch, master, updated. 108edf4936d97634b172049ec9a2cd533bc9d0e1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit df1bb76ed04f548a1edbcf237520eeb3f2247f90
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 15:54:49 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

-- 
kplotting packaging