Merge branch 'master' of https://github.com/tweepy/tweepy
authorgrocerheist <groceryheist@gmail.com>
Wed, 31 Dec 2014 21:05:24 +0000 (13:05 -0800)
committergrocerheist <groceryheist@gmail.com>
Wed, 31 Dec 2014 21:05:24 +0000 (13:05 -0800)

Trivial merge