From 92138d41ef124ce1a0173c112db9aed909c6256d Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@users.sourceforge.net>
Date: Fri, 13 Apr 2012 13:13:08 +0300
Subject: [PATCH] Builder: Ignore "merge commit" entries in feeds

---
 distrib/builder/changes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distrib/builder/changes.py b/distrib/builder/changes.py
index 9a815bca7b..ad5e69a769 100644
--- a/distrib/builder/changes.py
+++ b/distrib/builder/changes.py
@@ -81,7 +81,7 @@ def __init__(self, fromTag, toTag):
         self.parse()
         
     def should_ignore(self, subject):
-        if subject.startswith("Merge branch"):
+        if subject.startswith("Merge branch") or subject.startswith("Merge commit"):
             # Branch merges are not listed.
             return True
         return False