From: drevicko <subscriptions@drevicko.com>
Date: Mon, 23 Dec 2013 23:22:00 +0000 (+1100)
Subject: Merge rebased branch 'master' into fix-missing-params-metadata
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ab1e69f5e69bf2a671a6a51a9cbd32a68744c7ed;p=tweepy.git

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

Conflicts:
	tweepy/api.py
---

ab1e69f5e69bf2a671a6a51a9cbd32a68744c7ed