[nrpe/el6: 6/6] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 19b96d63e462477d6337d13c0daa81805e94fcda
Merge: e8d4162 d64e247
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri May 31 14:27:00 2013 -0600

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore                                         |    1 +
 ...drestart-try-restart-target-to-initscript.patch |   37 +++++++++
 nrpe.service                                       |    2 +-
 nrpe.spec                                          |   82 ++++++++++++--------
 sources                                            |    2 +-
 5 files changed, 88 insertions(+), 36 deletions(-)
---