From: Joey Hess <joey@kitenet.net>
Date: Mon, 4 Nov 2013 16:33:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgit/dgit/sid'
X-Git-Tag: debian/2.50~4
X-Git-Url: http://git.ieval.ro/?p=filters.git;a=commitdiff_plain;h=e372af427787f4a8870b18b5657f339f79f2422b;hp=0d0afb25b33c5b6c5cd2432a0448c66f91fb0a09

Merge remote-tracking branch 'dgit/dgit/sid'
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs