From: Joshua Roesslein <jroesslein@gmail.com>
Date: Tue, 17 Apr 2012 16:12:08 +0000 (-0500)
Subject: Merge pull request #168 from srj55.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aa6a31d54b48338e2954daa7e34e9cc655a7ee78;p=tweepy.git

Merge pull request #168 from srj55.

Conflicts:
	tweepy/streaming.py
---

aa6a31d54b48338e2954daa7e34e9cc655a7ee78