[SCM] libspectre packaging branch, master, updated. debian/0.2.6-2-1-ge11cf5f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libspectre.git;a=commitdiff;h=e11cf5f

The following commit has been merged in the master branch:
commit e11cf5f7935f1c71a8dcf23a83c2838f0cb7914a
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 25 15:06:26 2012 +0200

    add a .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

-- 
libspectre packaging