[python-keyring/epel7: 4/4] Merge branch 'master' into epel7

[Christopher Meng]

commit 8c1917aafa4868787d4f6316b9168752b8626aff
Merge: 1ef653e 3116048
Author: Christopher Meng <i at cicku.me>
Date:   Sat Aug 2 17:55:43 2014 +0800

    Merge branch 'master' into epel7

 .gitignore          |    1 +
 python-keyring.spec |   11 ++++++++++-
 sources             |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --cc python-keyring.spec
index 5f63d95,4ae2777..be7b4d1
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@@ -1,7 -1,7 +1,7 @@@
 -%global with_python3 1
 +%global with_python3 0
  
  Name:           python-keyring
- Version:        3.8
+ Version:        4.0
  Release:        1%{?dist}
  Summary:        Python 2 library to store and access passwords safely
  License:        Python