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

[Christopher Meng]

commit 1ef653e916a5f89678132e2d29515dac3e8a6fd4
Merge: cd54b17 507688c
Author: Christopher Meng <i at cicku.me>
Date:   Tue May 13 09:29:36 2014 +0800

    Merge branch 'master' into epel7

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