[nagios-plugins/el5/master: 49/49] Merge branch 'master' into el5/master

[Peter Lemenkov]

commit da3052a94ba7f90cefcac4edfb0bba577ef2f212
Merge: 22dec2f 0ca327c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 19 00:03:58 2010 +0400

    Merge branch 'master' into el5/master
    
    Conflicts:
    	.gitignore
    	nagios-plugins.spec
    	sources

 .gitignore                                         |    1 +
 ...-behaviour-in-case-of-self-signed-certifi.patch |   27 --------------------
 nagios-plugins.spec                                |   14 +++++-----
 sources                                            |    2 +-
 4 files changed, 9 insertions(+), 35 deletions(-)
---