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

Merge branch 'master' into remove_basic
---

faa69c615f0434cc963eac1f8ccdd554a97fb610