[httrack/el6] (8 commits) ...Merge branch 'f20' into el6

[Christopher Meng]

Summary of changes:

  7ce6fc0... Changelog merge cleanup. (*)
  58d60ea... Revert back to the old macro (*)
  f1d0622... Merge branch 'master' into f20 (*)
  565beb2... Update to 3.48.19 (*)
  befb37e... Merge branch 'master' into f20 (*)
  e4aa040... Add missing openssl-devel to the -devel subpkg; SPEC cleanu
  4349122... Merge branch 'master' into f20
  57a2cc1... Merge branch 'f20' into el6

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