[fish/f20] (3 commits) ...Fix the fixes

[amluto]

Summary of changes:

  16cec3d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  4de0b65... Improve fixes for CVE-2014-2905 and CVE-2014-2914 (*)
  3386c6f... Fix the fixes (*)

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