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

[Peter Lemenkov]

commit 6b42d2dc91bf40385e6b93534e2d9ce705beeed0
Merge: 9b8a05c 3e330ac
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun May 6 19:42:09 2012 +0400

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

 .gitignore                    |    1 +
 nagios-plugins-check_sip.spec |   21 ++++++++++++++++++---
 sources                       |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---