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

[Dan Horák]

commit 4ede87e4ee38adfc7a1ad3876cd78a354eae125e
Merge: ff7d649 2692cce
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 5 18:24:44 2011 +0200

    Merge branch 'f14' into el6

 .gitignore  |    1 +
 sources     |    2 +-
 zabbix.spec |   14 +++++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)
---