[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.8.0-7-ge860948

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 0c8ffe313b515ffd66423c0b449724738ca810ca
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri May 28 21:33:42 2010 +0300

    Use dpkg-mergechangelogs for debian/changelog.
---
 .gitattributes |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs

-- 
Debian Qt/KDE packaging tools