[zabbix/el6: 3/3] Merge branch 'f14' into el6

[Dan Horák]

commit c18c9f6b6d7cdfe957d23446fee139ff3173cd27
Merge: 4ede87e a648684
Author: Dan Horák <dan at danny.cz>
Date:   Sat Sep 10 10:26:07 2011 +0200

    Merge branch 'f14' into el6

 zabbix-1.8.7-zbx4099.patch |   37 +++++++++++++++++++++++++++++++++++++
 zabbix.spec                |   10 ++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)
---