[zabbix/f13/master: 2/2] Merge branch 'master' into f13

[Dan Horák]

commit 2c6d8656c33f9d0567517a95d6069b6d41857410
Merge: 6991e8a 1504b56
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 13 12:03:56 2010 +0200

    Merge branch 'master' into f13

 zabbix-1.8.3-fonts-config.patch |    2 +-
 zabbix.spec                     |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---