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

[Peter Lemenkov]

commit d961e3a495e66b37a5e08c84ede79aadb9fbbb6d
Merge: ddba11c 7c7b66a
Author: Fedora Build <lemenkov at gmail.com>
Date:   Sun Sep 16 10:05:10 2012 +0400

    Merge branch 'master' into el6

 ...plugins-check_sip-0001-Fix-for-Nagios-3.x.patch |   38 ++++++++++++++++++++
 nagios-plugins-check_sip.spec                      |   14 ++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)
---