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

[Christopher Meng]

commit f5e74152af1871d1514df5cfc2b36e15b068a1ba
Merge: 8bf582c a283411
Author: Christopher Meng <i at cicku.me>
Date:   Thu Aug 21 16:01:14 2014 +0800

    Merge branch 'master' into epel7

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