From: Joshua Roesslein <jroesslein@gmail.com>
Date: Tue, 11 Jun 2013 03:31:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'master' into search-v1.1
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=21055ad59f35d9c37f3fc15e841ebd590d7f335a;p=tweepy.git

Merge remote-tracking branch 'master' into search-v1.1

Conflicts:
	tweepy/models.py
---

21055ad59f35d9c37f3fc15e841ebd590d7f335a