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

[Christopher Meng]

commit aa942e3d4122e80cd224f2315801a6ea49d61270
Merge: 5987abf 3116048
Author: Christopher Meng <i at cicku.me>
Date:   Sun Aug 3 12:01:55 2014 +0800

    Merge branch 'master' into f20

 .gitignore          |    1 +
 python-keyring.spec |   11 ++++++++++-
 sources             |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---