[nagios/f12/master: 2/2] Merge branch 'master' into f12/master

Tue Nov 16 10:33:12 UTC 2010

commit 3ec555174211aee7f215bd66682c082e45f09cae
Merge: 3ffdd12 78de83b
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Nov 16 13:33:06 2010 +0300

    Merge branch 'master' into f12/master

 nagios-0001-from-rpm.patch                         |    4 +-
 nagios-0002-SELinux-relabeling.patch               |    4 +-
 nagios-0003-Fix-etc-init.d-nagios-status.patch     |    4 +-
 ...-installation-of-httpd-conf.d-config-file.patch |    4 +-
 nagios-0005-Install-config-files-too.patch         |    4 +-
 nagios-0006-Do-not-start-service-by-default.patch  |    4 +-
 ...ript-should-return-2-in-case-of-unknown-c.patch |    4 +-
 nagios-0008-Fix-path-to-CGI-executables.patch      |   46 ++++++++++++++++++++
 nagios.spec                                        |   10 ++++-
 9 files changed, 69 insertions(+), 15 deletions(-)
---