[SCM] Phonon VLC backend packaging branch, master, updated. debian/0.6.2-2-5-g7cccc53

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-vlc.git;a=commitdiff;h=c41bfc2

The following commit has been merged in the master branch:
commit c41bfc2ef4b6fd5a00b87a08df72d634bae2ee7a
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 18 16:54:36 2013 +0200

    add a .gitattributes
---
 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

-- 
Phonon VLC backend packaging