[zabbix/el6/master: 6/6] Merge branch 'f14' into el6

[Dan Horák]

commit 5bf27eef22f311c9bd9e2688f6746c349fb2dc43
Merge: 30beff5 86d76eb
Author: Dan Horák <dan at danny.cz>
Date:   Tue Nov 23 10:35:03 2010 +0100

    Merge branch 'f14' into el6

 zabbix-1.8.3-email-fix.patch |   53 ++++++++++++++++++++++++++++++++++++++++++
 zabbix.spec                  |   12 ++++++++-
 2 files changed, 64 insertions(+), 1 deletions(-)
---