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

[Christopher Meng]

Summary of changes:

  22821d4... Update python-keyring to version 3.1 for python2 as well as (*)
  5e9c40a... Update to 3.3 Fix SPEC mess. (*)
  b977d7f... Merge branch 'master' into f20
  48c57f1... Use sed instead of patch to make life easier. (*)
  771d811... Manually merge.
  5603f99... Update gitignore. (*)
  253496f... Update gitignore. (*)
  4c48cd4... Merge branch 'master' into f20
  b22da4f... Cleanup. (*)
  daac798... Merge branch 'master' into f20

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