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

[Dan Horák]

commit 273a58b431c1d6aa5c18b261962f43c67071eb93
Merge: ceae37c dd6fd94
Author: Dan Horák <dan at danny.cz>
Date:   Thu Apr 21 11:03:09 2011 +0200

    Merge branch 'f14' into el6

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