[file/f20] (5 commits) ...fix #1155464 - fix for CVE-2014-3710

[Jan Kaluža]

Summary of changes:

  f5e3aac... fix license handling (*)
  6e7b7e9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  67ac402... merge with master (*)
  1473507... Merge branch 'master' into f21 (*)
  d88099c... fix #1155464 - fix for CVE-2014-3710 (*)

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