[SCM] kdf packaging branch, master, updated. 43f99f5f9a6cfe61e00bac52b8faeb11aebf3953

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdf.git;a=commitdiff;h=43f99f5

The following commit has been merged in the master branch:
commit 43f99f5f9a6cfe61e00bac52b8faeb11aebf3953
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jun 19 21:30:59 2012 -0300

    Add debian/.gitattributes.
---
 debian/.gitattributes |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

-- 
kdf packaging