Merge rebased branch 'master' into fix-missing-params-metadata

author drevicko <subscriptions@drevicko.com>

Mon, 23 Dec 2013 23:22:00 +0000 (10:22 +1100)

committer drevicko <subscriptions@drevicko.com>

Mon, 23 Dec 2013 23:22:00 +0000 (10:22 +1100)
author drevicko <subscriptions@drevicko.com>
Mon, 23 Dec 2013 23:22:00 +0000 (10:22 +1100)
committer drevicko <subscriptions@drevicko.com>
Mon, 23 Dec 2013 23:22:00 +0000 (10:22 +1100)
diff --cc tweepy/api.py
Simple merge
diff --cc tweepy/models.py
Simple merge
author	drevicko <subscriptions@drevicko.com>
	Mon, 23 Dec 2013 23:22:00 +0000 (10:22 +1100)
committer	drevicko <subscriptions@drevicko.com>
	Mon, 23 Dec 2013 23:22:00 +0000 (10:22 +1100)
		1	2
tweepy/api.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/models.py	patch \|	diff1 \|	diff2 \|	blob \| history