[zabbix: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/zabbix

[Dan Horák]

commit 0d277e367de481dea739ca92dc346ccdc90173b8
Merge: cdd6f8d 95f91e0
Author: Dan Horák <dan at danny.cz>
Date:   Wed Mar 21 12:16:56 2012 +0100

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

 zabbix.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc zabbix.spec
index 993c6ab,ace4cfa..9690f05
--- a/zabbix.spec
+++ b/zabbix.spec
@@@ -686,9 -686,9 +686,12 @@@ f
  
  
  %changelog
 +* Wed Mar 21 2012 Dan Horák <dan[at]danny.cz> - 1.8.11-1
 +- update to 1.8.11
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.10-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Dec 28 2011 Dan Horák <dan[at]danny.cz> - 1.8.10-1
  - update to 1.8.10 (fixes CVE-2011-4615)