[SCM] qtdoc packaging branch, master, updated. 9f61c6402ce5cc1af099140400181a41b4933d7e

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdoc.git;a=commitdiff;h=0ed5f27

The following commit has been merged in the master branch:
commit 0ed5f277587cf442f6d2c5d0950d3369c295fad7
Author: Pino Toscano <pino at debian.org>
Date:   Thu May 2 12:53:54 2013 +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

-- 
qtdoc packaging