From 223bf4119f8d2662e3c93cf2ae0418292958c81b Mon Sep 17 00:00:00 2001
From: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date: Aug 11 2012 08:02:03 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/pnp4nagios


Conflicts:
	pnp4nagios.spec

---

diff --git a/pnp4nagios.spec b/pnp4nagios.spec
index 5311583..3d4251d 100644
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.6.16
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -138,9 +138,15 @@ fi
 %{_datadir}/nagios/html/%{name}/kohana
 
 %changelog
-* Sat Aug 11 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-2
+* Sat Aug 11 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-4
 - CVE-2012-3457 - process_perfdata.cfg world readable
 
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Thu Nov 24 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-1
 - update to upstream