[nikto/el6/master: 15/15] Merge remote-tracking branch 'origin/master' into el6/master

[rebus]

commit b4431d7108f670dadee399b68459e3aa5e475116
Merge: eadf95d 341c43b
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Tue Apr 12 02:25:35 2011 +0200

    Merge remote-tracking branch 'origin/master' into el6/master

 nikto.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---