From: Aaron Hill <aa1ronham@gmail.com>
Date: Wed, 18 Jun 2014 16:38:50 +0000 (-0400)
Subject: Merge branch 'foutoucour-master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=605a9113453d246a0214ff4929e949009771cfec;p=tweepy.git

Merge branch 'foutoucour-master'
---

605a9113453d246a0214ff4929e949009771cfec