Merge branch 'master' into add_update_banner
authorAaron Hill <aa1ronham@gmail.com>
Tue, 20 Aug 2013 16:57:04 +0000 (12:57 -0400)
committerAaron Hill <aa1ronham@gmail.com>
Tue, 20 Aug 2013 16:57:04 +0000 (12:57 -0400)
1  2 
tests/test_api.py
tweepy/api.py

Simple merge
diff --cc tweepy/api.py
Simple merge