Merge branch 'develop' of https://github.com/jbrendel/requests into develop

Conflicts:
	AUTHORS
	requests/__init__.py

diff --cc AUTHORS
index 776e791cbe968d61e632b23d933f52681974d42e,2ebcdfda9a0ec154f34ae1179996474ad796b627..e3dd319f6d967f131b90a15ef2a2b0409b3a137f
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -50,4 -50,4 +50,5 @@@ Patches and Suggestion
  - Dan Head
  - Bruno Renié
  - David Fischer
- - Joseph McCullough
++- Joseph McCullough
+ - Juergen Brendel

diff --cc requests/__init__.py
index 027ea3c5d5ffd3967ecc0a49730a709ed14b880f,d496b98d07533ed600e5dfe0675670bdc05ac85f..e3a9d2a0e8c11cae5c84845a971d06d2f896d590
--- 1/requests/__init__.py
--- 2/requests/__init__.py
+++ b/requests/__init__.py
@@@ -24,10 -24,10 +24,10 @@@ __copyright__ = 'Copyright 2011 Kennet
  
  from . import utils
  from .models import Request, Response
- from .api import request, get, head, post, patch, put, delete
 -from .api import request, get, options, head, post, patch, put, delete
 -from .sessions import session
++from .api import request, get, head, post, patch, put, delete, options
 +from .sessions import session, Session
  from .status_codes import codes
  from .exceptions import (
 -    RequestException, AuthenticationError, Timeout, URLRequired,
 -    TooManyRedirects
 +    RequestException, Timeout, URLRequired,
 +    TooManyRedirects, HTTPError, ConnectionError
  )

diff --cc requests/api.py
Simple merge

diff --cc requests/async.py
Simple merge

diff --cc requests/sessions.py
Simple merge