[monit: 17/17] Merge branch 'master' of ssh://pkgs.fedoraproject.org/monit

[Maxim Burgerhout]

commit 59cb10044e93f0a71dd4959576c9233f5b786322
Merge: 0bceee5 a0abab9
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Fri Dec 2 23:14:59 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/monit
    
    Conflicts:
    	monit.spec

 monit.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc monit.spec
index 208b6a0,2574393..d2a107b
--- a/monit.spec
+++ b/monit.spec
@@@ -106,14 -93,11 +106,17 @@@ f
  %{_bindir}/%{name}
  %{_mandir}/man1/monit.1*
  
 +
  %changelog
 +* Sun Nov 13 2011 Maxim Burgerhout <wzzrd at fedoraproject.org> - 5.3.1-1
 +- New upstream release 5.3.1
 +- Added systemd unit file and dropped sysv init support
 +- 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 at lists.fedoraproject.org> - 5.2.5-2
+ - Rebuilt for glibc bug#747377
+ 
  * Sat May 07 2011 Maxim Burgerhout <wzzrd at fedoraproject.org> - 5.2.5-1
  - Sync to upstream bugfix release; most important new features:
  - Memory footprint decreased by 10%