From: Aaron Hill <aa1ronham@gmail.com>
Date: Sat, 17 Aug 2013 11:22:27 +0000 (-0400)
Subject: Merge branch 'master' into remove_basic
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c9c1dceb739f44491218aa6111e996d528218eb7;p=tweepy.git

Merge branch 'master' into remove_basic
---

c9c1dceb739f44491218aa6111e996d528218eb7