Change Tabs to Spaces
Merge pull request #249 from sente/master

Added endpoints for followers/list.json and friends/friends.json.
Changing the path for report_spam.json according to API 1.1 docs
Merge pull request #270 from Oire/master

report_spam changed according to API 1.1 docs
Added language parameter to streaming filter

(see: https://dev.twitter.com/blog/introducing-new-metadata-for-tweets)
Merge pull request #278 from wywygmbh/master

Pull request: Added new language parameter to filter endpoint
added timeout to api constructor with default 60s, set timeout when creating HTTPConnection and HTTPSConnection in binder.py
	modified:   tweepy/api.py
	modified:   tweepy/binder.py
removed #FIXME implement timeout
	modified:   tweepy/binder.py
added to contributors file
remove endpoint as referenced by @joshthecoder in #288
Merge pull request #290.

- Removed un-needed commit.
Merge pull request #285.

- Fix code style issue.
Drop support for Python 2.5.
Merge pull request #250 from santosh/master

Changed all Tabs to Spaces
Add compression support.

Conflicts:
	tweepy/api.py
Merge pull request #81.

- Add compression support (gzip).
Add encrypted Twitter API keys for Travis CI.
Only build master branch on Travis.
Fix a flaky API tests.

Twitter returns back a short version of the URL
which fails the equality assertion.
Another flaky test.