[xscreensaver/f17] (17 commits) ...fix conflict

[Mamoru Tasaka]

Summary of changes:

  9b83d0e... Fix segv when quitting hack with -pair option (bug 819349) (*)
  60149f5... xscreensaver-demo should not truncate http:// to http:/ (*)
  60fa5b4... Fix Patch36 a bit (*)
  888fb0d... And again fix Patch36 a bit... (*)
  c176fd7... Enable account type pam validation on F-18+ (debian bug 656 (*)
  01f59fa... Update to 5.16 (*)
  17c9972... Update to 5.17 (*)
  149e293... Don't call ctime in blurb in signal hander, patch by jwz (*)
  88b852d... Update to 5.18 (*)
  469a65f... Fix -verbose option usage in widwhacker as written in usage (*)
  0273c7e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  be0810b... Update to 5.19 (*)
  0c4c435... Fix segv on lament with -wireframe option (bug 849961) (*)
  fbe5d04... More fix on bug 849961 (lament -no-texture) (*)
  2a428a5... Remove warning from calling glLighti with float argument in (*)
  b3accd7... A bit spec file cleanup (*)
  6ab1a7b... fix conflict

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