[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 001b408e2548adf1280c9efece029755ccb95ab4
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Jul 13 19:47:47 2009 +0300

    Add .gitattributes to set ChangeLog merge driver.

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..0922ddf
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=cl-merge

-- 
Debian repository for ClamAV