[pnp4nagios/el6: 8/8] update to upstream

[Ján ONDREJ]

commit 9a96ca83c0ab7aba06358be1df1449a029d2cbac
Merge: c734c44 3ca9ecb
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Sat Feb 16 11:13:03 2013 +0100

    update to upstream
    
    Merge branch 'master' into el6
    
    Conflicts:
    	pnp4nagios.spec

 .gitignore      |    1 +
 pnp4nagios.spec |    7 +++++--
 sources         |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc pnp4nagios.spec
index 71d2c0b,670d47f..cdae779
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@@ -138,11 -138,20 +138,14 @@@ f
  %{_datadir}/nagios/html/%{name}/kohana
  
  %changelog
 -* Sat Feb 16 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-1
++* Sat Feb 16 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.19-1
+ - update to upstream
+ 
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.16-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Sat Aug 11 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-4
 +* Mon Sep 03 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 at 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 at lists.fedoraproject.org> - 0.6.16-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Thu Apr 05 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-2
 +- Removed double slashes fro directories (BZ#810212).
  
  * Thu Nov 24 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-1
  - update to upstream