Merge branch 'master' of github.com:joshthecoder/tweepy

tweepy/streaming.py

@@ -191,7 +191,7 @@ class Stream(object):
             self.url += '&count=%s' % count
         self._start(async)
 
-    def filter(self, follow=None, track=None, async=False, locations=None):
+    def filter(self, follow=None, track=None, async=False, locations=None, count = None):
         self.parameters = {}
         self.headers['Content-type'] = "application/x-www-form-urlencoded"
         if self.running:
@@ -204,6 +204,8 @@ class Stream(object):
         if locations and len(locations) > 0:
             assert len(locations) % 4 == 0
             self.parameters['locations'] = ','.join(['%.2f' % l for l in locations])
+	if count:
+		self.parameters['count'] = count
         self.body = urllib.urlencode(self.parameters)
         self.parameters['delimited'] = 'length'
         self._start(async)