[nikto] (8 commits) ...Merge remote-tracking branch 'origin/master' into el6/master

[rebus]

Summary of changes:

  a925a05... Fix typo that causes a failure to update the common directo (*)
  71b93f1... Resolve rhbz #515871 (*)
  daa251e... new upstream (*)
  aac590b... Initialize branch EL-6 for nikto (*)
  22af9c3... dist-git conversion (*)
  c94444b... cleanup (*)
  eadf95d... Merge remote-tracking branch 'origin/master' into el6/maste (*)
  b4431d7... Merge remote-tracking branch 'origin/master' into el6/maste (*)

(*) This commit already existed in another branch; no separate mail sent