From 579ee5e5d3c25fd9e3bced553ca3e2a27648b4b1 Mon Sep 17 00:00:00 2001
From: Xavier Bachelot <xavier@bachelot.org>
Date: Sep 27 2010 21:09:34 +0000
Subject: Merge branch 'master' into f12


Conflicts:
	pnp4nagios.spec

---

diff --git a/pnp4nagios.spec b/pnp4nagios.spec
index 64d4161..c45ad55 100644
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.4.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -128,6 +128,9 @@ fi
 
 
 %changelog
+* Mon Sep 27 2010 Xavier Bachelot <xavier@bachelot.org> 0.4.14-4
+- Bump release for rebuild.
+
 * Sun Jul 18 2010 Xavier Bachelot <xavier@bachelot.org> 0.4.14-3
 - Add patch to fix PHP deprecated warnings with PHP 5.3.
   (Patch from Jan Ondrej - RHBZ#572851)