[SCM] qtsensors packaging branch, master, updated. f1f259a306d01899543056782150391d7485ca37

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit fa5c86f28db5366c94c12c3a754ee2fed4a1fe1c
Author: Pino Toscano <pino at kde.org>
Date:   Thu May 30 15:17:48 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

-- 
qtsensors packaging