[zabbix/f13/master: 4/4] Merge branch 'f14' into f13

[Dan Horák]

commit 8125248598d278fb1eb3bdfd2afd3ceed8d33065
Merge: 0cb9b59 3335918
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jan 5 11:14:50 2011 +0100

    Merge branch 'f14' into f13

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 zabbix-1.8.3-cloexec.patch                         |  119 --------------------
 zabbix-1.8.3-email-fix.patch                       |   53 ---------
 zabbix-1.8.3-fonts-config.patch                    |   12 --
 ...1.8.3-config.patch => zabbix-1.8.4-config.patch |    8 +-
 zabbix-1.8.4-fonts-config.patch                    |   12 ++
 zabbix.spec                                        |   21 ++--
 8 files changed, 27 insertions(+), 201 deletions(-)
---