diff options
author | andy <andy@whiskeymedia.com> | 2010-01-18 11:48:57 -0800 |
---|---|---|
committer | andy <andy@whiskeymedia.com> | 2010-01-18 11:48:57 -0800 |
commit | 688ecada1e112bfa59bcdf829c5c23cdbf61c08b (patch) | |
tree | 2c4cef2cf74a809b7d2a03ba985ef48ce7170c1f /redis/exceptions.py | |
parent | 9b7d86233e7b3cff1d240448a4beb6ce8c35894a (diff) | |
parent | 30980d331dbf28af4c01c526ed7fd440171dc574 (diff) | |
download | redis-py-688ecada1e112bfa59bcdf829c5c23cdbf61c08b.tar.gz |
Merge remote branch 'adamcharnock/master'
Conflicts:
redis.py
Diffstat (limited to 'redis/exceptions.py')
0 files changed, 0 insertions, 0 deletions