[SCM] bluedevil packaging branch, master, updated. debian/1.2.3-1-5-g5e574ab

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/bluedevil.git;a=commitdiff;h=8258ef1

The following commit has been merged in the master branch:
commit 8258ef11d1b80b17fea14636cc37bf0174c6ba44
Author: Pino Toscano <pino at debian.org>
Date:   Fri May 17 13:00:22 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

-- 
bluedevil packaging