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

[Jose Pedro Oliveira]

commit 5f6de0f56eddac941669aff9a74b0e7ad3d907f2
Merge: 3bc861e 15a825b
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Fri Aug 17 15:29:46 2012 +0100

    Merge branch 'master' into el6

 nagios-plugins-0008-ntpdate-and-ntpq-paths.patch |   13 ++++++++
 nagios-plugins.spec                              |   37 +++++++++++++++++++---
 2 files changed, 45 insertions(+), 5 deletions(-)
---