Merge pull request #2258 from willingc/add-json

Add json parameter

diff --cc requests/api.py
index 57a91d5591dfa357758016697fa2c947f6b336c1,88db7dc72ec8e876b84ec2a8886f37a0e0edbb18..4eaaf9e65144ad0fb9447463b6799ab2a064f25f
--- 1/requests/api.py
--- 2/requests/api.py
+++ b/requests/api.py
@@@ -22,16 -22,13 +22,17 @@@ def request(method, url, **kwargs)
      :param url: URL for the new :class:`Request` object.
      :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
      :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+     :param json: (optional) json data to send in the body of the :class:`Request`.
      :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
      :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
 -    :param files: (optional) Dictionary of 'name': file-like-objects (or {'name': ('filename', fileobj)}) for multipart encoding upload.
 +    :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': ('filename', fileobj)}``) for multipart encoding upload.
      :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
 -    :param timeout: (optional) Float describing the timeout of the request in seconds.
 +    :param timeout: (optional) How long to wait for the server to send data
 +        before giving up, as a float, or a (`connect timeout, read timeout
 +        <user/advanced.html#timeouts>`_) tuple.
 +    :type timeout: float or tuple
      :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed.
 +    :type allow_redirects: bool
      :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
      :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided.
      :param stream: (optional) if ``False``, the response content will be immediately downloaded.

diff --cc requests/models.py
Simple merge

diff --cc requests/sessions.py
Simple merge

diff --cc test_requests.py
Simple merge