Merge branch 'backoff' of https://github.com/tewalds/tweepy into tewalds-backoff
authorAaron Hill <aa1ronham@gmail.com>
Sat, 21 Dec 2013 01:56:24 +0000 (20:56 -0500)
committerAaron Hill <aa1ronham@gmail.com>
Sat, 21 Dec 2013 01:56:24 +0000 (20:56 -0500)
commita592ff55540b20e99229355e54291eba86c79266
tree0344b936e5a4e6b692c446387322a4d15a8d9880
parent81658a996f7939be95df5bb609b50e37f0a6dbb6
parente44bf2a3335c3e90c6280533a1136236a91af766
Merge branch 'backoff' of https://github.com/tewalds/tweepy into tewalds-backoff

Conflicts:
test_requirements.txt
tweepy/streaming.py
test_requirements.txt
tests/test_streaming.py
tests/test_utils.py
tweepy/streaming.py