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

[Christopher Meng]

commit 9b1e71da43c6d4003198531302ac39a09acdea40
Merge: 1a21d58 fdfcbba
Author: Christopher Meng <i at cicku.me>
Date:   Sat Mar 8 18:52:46 2014 +0800

    Merge branch 'master' into epel7

 .gitignore          |    1 +
 python-keyring.spec |    5 ++++-
 sources             |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc python-keyring.spec
index 8b7ab03,9268156..d9d9f4f
--- 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.4
+ Version:        3.6
  Release:        1%{?dist}
  Summary:        Python 2 library to store and access passwords safely
  License:        Python