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

[Christopher Meng]

commit 6d1ac940ed0bf32b2935d8d7a4a4391f21ae1ebf
Merge: 5a195a7 5804f27
Author: Christopher Meng <i at cicku.me>
Date:   Tue May 13 09:20:17 2014 +0800

    Merge branch 'master' into f20

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