[SCM] qttranslations packaging branch, master, updated. 5ccd4c8c1c0715178d85d50e036de00835f6c1ab

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttranslations.git;a=commitdiff;h=5ccd4c8

The following commit has been merged in the master branch:
commit 5ccd4c8c1c0715178d85d50e036de00835f6c1ab
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 10 21:33:48 2013 -0300

    Add a gitattributes file.
---
 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

-- 
qttranslations packaging