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

[Jose Pedro Oliveira]

commit cae0a7eeff0b222173e00a68dc644d2ec57678dd
Merge: 9ab3758 ae56146
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sat Nov 10 15:35:55 2012 +0000

    Merge branch 'master' into el6

 .gitignore  |    1 +
 nagios.spec |   13 ++++++++-----
 sources     |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---