[nrpe/el6: 3/3] Merge branch 'master' into el6

[Sam Kottler]

commit 79ee186e64d39af69b3b8c6f9e977ccefe396801
Merge: 084a9d2 9408541
Author: Sam Kottler <shk at linux.com>
Date:   Wed Apr 30 21:22:32 2014 -0400

    Merge branch 'master' into el6
    
    * master:
      Add patch for CVE-2014-2913 (BZ#1089879)
      Update to 2.15

 .gitignore                                         |    1 +
 nrpe-0009-CVE-2014-2913-nasty-metacharacters.patch |   13 +++++++++++
 nrpe.spec                                          |   23 +++++++++++++++----
 sources                                            |    2 +-
 4 files changed, 33 insertions(+), 6 deletions(-)
---