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

[Christopher Meng]

commit 210a8c745a145ae6476e61448d91cdc7448a21a8
Merge: aa942e3 352fecf
Author: Christopher Meng <i at cicku.me>
Date:   Fri Feb 6 08:39:00 2015 +0800

    Merge branch 'master' into f20

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