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

Merge branch 'master' into pull_coverage
---

f30bf332301c6cd87f0d725fc82572f49990eb37