[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/1.1.2-2-gb52b31a

[Pino Toscano]

The following commit has been merged in the master branch:
commit b52b31a8ece1aa7ea9f293002ac301b8ab1cd92d
Author: Pino Toscano <pino at kde.org>
Date:   Wed Jan 26 16:10:04 2011 +0100

    set the right merge system for changelog
---
 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

-- 
Kaboom - Debian KDE 3->4 migration tool