[file/f21] (6 commits) ...merge with master

[Jan Kaluža]

Summary of changes:

  9585be7... fix license handling (*)
  30a7e5d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  1548366... fix #1132787 - CVE-2014-3587 (*)
  d25a33e... fix #1132787 - CVE-2014-3587 (*)
  48e789c... add missing patch (*)
  67ac402... merge with master

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