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

[Jose Pedro Oliveira]

commit 85fd59dae1b732c76462f9205efa200232b196b7
Merge: a958249 0fba9c1
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Mon Jul 2 00:20:36 2012 +0100

    Merge branch 'master' into el6

 ...os-plugins-0007-undef-gets-and-glibc-2.16.patch |   14 +++++++++++
 nagios-plugins.README.Fedora                       |    8 ++++--
 nagios-plugins.spec                                |   25 +++++++++++++++++--
 3 files changed, 41 insertions(+), 6 deletions(-)
---