From: Joshua Roesslein <jroesslein@gmail.com>
Date: Fri, 27 Dec 2013 18:14:39 +0000 (-0600)
Subject: Merge pull request #235.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b322dd231f70a24d9cee59e48ee1478cf05978ea;p=tweepy.git

Merge pull request #235.

Conflicts:
	tweepy/api.py
---

b322dd231f70a24d9cee59e48ee1478cf05978ea
diff --cc tweepy/api.py
index 0d4cccc,9c83a54..e0d955e
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@@ -682,11 -759,11 +682,17 @@@ class API(object)
          allowed_param = ['lat', 'long', 'name', 'contained_within']
      )
  
 +    """ help/languages.json """
 +    supported_languages = bind_api(
 +        path = '/help/languages.json',
 +        payload_type = 'json',
 +        require_auth = True
++
+     """help/configuration"""
+     configuration = bind_api(
+         path = '/help/configuration.json',
+         payload_type = 'json',
+         require_auth = True,
      )
  
      """ Internal use only """