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

[Christopher Meng]

commit 5987abf90ffe5ac491731416b741443d06774d6d
Merge: 6d1ac94 507688c
Author: Christopher Meng <i at cicku.me>
Date:   Tue May 13 09:29:31 2014 +0800

    Merge branch 'master' into f20

 python-keyring.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---