[python-keyring/f19] (10 commits) ...Merge branch 'master' into f19

[Christopher Meng]

Summary of changes:

  fc952d1... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  22821d4... Update python-keyring to version 3.1 for python2 as well as (*)
  5e9c40a... Update to 3.3 Fix SPEC mess.
  48c57f1... Use sed instead of patch to make life easier.
  7c48a75... Manually merge
  5603f99... Update gitignore.
  253496f... Update gitignore.
  8eac7d9... Merge branch 'master' into f19
  b22da4f... Cleanup.
  c708db3... Merge branch 'master' into f19

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