[spyder/f20] (5 commits) ...Merge branch 'f21' into f20

[Radek Novacek]

Summary of changes:

  b9ffb45... new upstream version 2.2.4 (#1010935) (*)
  e289342... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  d456783... Add Requires: qtwebkit (#1121360) (*)
  7325df1... Remove Requires: qtwebkit as its already pulled by PyQt4 (*)
  4522ee6... Merge branch 'f21' into f20

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