Merge branch 'master' into add_update_banner

author Aaron Hill <aa1ronham@gmail.com>

Sat, 17 Aug 2013 21:03:54 +0000 (17:03 -0400)

committer Aaron Hill <aa1ronham@gmail.com>

Sat, 17 Aug 2013 21:03:54 +0000 (17:03 -0400)
author Aaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 21:03:54 +0000 (17:03 -0400)
committer Aaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 21:03:54 +0000 (17:03 -0400)
diff --cc tests/test_api.py
Simple merge
diff --cc tweepy/api.py
Simple merge
diff --cc tweepy/binder.py
Simple merge
author	Aaron Hill <aa1ronham@gmail.com>
	Sat, 17 Aug 2013 21:03:54 +0000 (17:03 -0400)
committer	Aaron Hill <aa1ronham@gmail.com>
	Sat, 17 Aug 2013 21:03:54 +0000 (17:03 -0400)
		1	2
tests/test_api.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/api.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/binder.py	patch \|	diff1 \|	diff2 \|	blob \| history