[SCM] ViennaCL packaging branch, master, updated. debian/1.1.1-1-18-g43cf8e4

[Michael Wild]

The following commit has been merged in the master branch:
commit 6ce29cb7aa48a41f475266b5e7fb83b61a0e9888
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Tue Jul 5 19:35:13 2011 +0200

    Use dpkg-mergechangelogs to merge debian/changelog
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

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

-- 
ViennaCL packaging