[python-keyring/f20: 2/2] Merge branch 'master' into f20

[Christopher Meng]

commit 5a195a76d2242cc14da3e924b8bdc946180cd78e
Merge: a08d261 fdfcbba
Author: Christopher Meng <i at cicku.me>
Date:   Sat Mar 8 18:52:38 2014 +0800

    Merge branch 'master' into f20

 .gitignore          |    1 +
 python-keyring.spec |    5 ++++-
 sources             |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index bc4488c,582700a..e1bed70
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,7 +1,3 @@@
 -/keyring-0.4.tar.gz
 -/keyring-0.5.1.tar.gz
 -/keyring-0.7.zip
 -/keyring-3.1.zip
  /keyring-3.3.zip
  /keyring-3.4.zip
+ /keyring-3.6.zip