[SCM] parley packaging branch, master, updated. 40a8ba95e46aa43b4cd5011170a776a664ec351f

[Pino Toscano]

The following commit has been merged in the master branch:
commit 40a8ba95e46aa43b4cd5011170a776a664ec351f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 20 00:46:20 2011 +0100

    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

-- 
parley packaging