[nagios-plugins/el6/master: 9/9] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit f8540e9eb15911f5c375e81d6b358e736027e508
Merge: 7bf40a7 0ca327c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 19 00:01:06 2010 +0400

    Merge branch 'master' into el6/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(-)
---