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

[Jose Pedro Oliveira]

commit 3bc861eb58093ec0bf6a7da1d1beb796336710c3
Merge: 85fd59d 876a0be
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Fri Jul 20 01:49:55 2012 +0100

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...heck_linux_raid-with-on-linear-raid0-arra.patch |   53 --------------------
 nagios-plugins.spec                                |   23 ++++++--
 sources                                            |    2 +-
 4 files changed, 19 insertions(+), 60 deletions(-)
---