[SCM] QImageBlitz packaging branch, master, updated. debian/0.0.4-3-6-gdfe2756

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 69aa3512a25a12301268a90c4b89e0572f05f873
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jul 26 03:22:44 2010 +0300

    Use dpkg-mergechangelogs merge driver for the changelog.
---
 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

-- 
QImageBlitz packaging