From: Aaron1011 <aa1ronham@gmail.com>
Date: Tue, 28 Oct 2014 18:46:02 +0000 (-0400)
Subject: Merge pull request #500 from rother/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=64494d286e854f82a91fde92b9960ca81377a69b;p=tweepy.git

Merge pull request #500 from rother/master

Update api.rst
---

64494d286e854f82a91fde92b9960ca81377a69b