Merge pull request #1042 from nyanye/master

author Joshua Roesslein <jroesslein@gmail.com>

Sat, 2 Jun 2018 22:48:13 +0000 (17:48 -0500)

committer GitHub <noreply@github.com>

Sat, 2 Jun 2018 22:48:13 +0000 (17:48 -0500)
author Joshua Roesslein <jroesslein@gmail.com>
Sat, 2 Jun 2018 22:48:13 +0000 (17:48 -0500)
committer GitHub <noreply@github.com>
Sat, 2 Jun 2018 22:48:13 +0000 (17:48 -0500)
diff --cc tests/test_streaming.py
Simple merge
diff --cc tweepy/streaming.py
Simple merge
author	Joshua Roesslein <jroesslein@gmail.com>
	Sat, 2 Jun 2018 22:48:13 +0000 (17:48 -0500)
committer	GitHub <noreply@github.com>
	Sat, 2 Jun 2018 22:48:13 +0000 (17:48 -0500)
		1	2
tests/test_streaming.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/streaming.py	patch \|	diff1 \|	diff2 \|	blob \| history