From 59cb10044e93f0a71dd4959576c9233f5b786322 Mon Sep 17 00:00:00 2001
From: Maxim Burgerhout <maxim@wzzrd.com>
Date: Dec 02 2011 22:14:59 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/monit


Conflicts:
	monit.spec

---

diff --git a/monit.spec b/monit.spec
index 208b6a0..d2a107b 100644
--- a/monit.spec
+++ b/monit.spec
@@ -114,6 +114,9 @@ fi
 - Dropped the patch that changed the default name of the configuration file
 - Dropped the patch that silenced daemon startup
 
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.5-2
+- Rebuilt for glibc bug#747377
+
 * Sat May 07 2011 Maxim Burgerhout <wzzrd@fedoraproject.org> - 5.2.5-1
 - Sync to upstream bugfix release; most important new features:
 - Memory footprint decreased by 10%