[SCM] libindi packaging branch, master, updated. debian/1.2.0-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9e12e5aa4c2175c2ed356940dacaf29e2fdcae94
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 26 15:08:35 2016 +0200

    Add a .gitattributes file to use dpkg-mergechangelogs
---
 debian/.gitattributes | 1 +
 1 file changed, 1 insertion(+)

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

-- 
libindi packaging