Merge branch 'master' into dispatcher-rework

jh0ker · jh0ker · commit ad211655eafc · 2016-04-17T12:45:31.000+02:00
Conflicts:
	README.rst
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -106,6 +106,9 @@ def decorator(*args, **kwargs):
         except HTTPException as error:
             raise NetworkError('HTTPException: {0!r}'.format(error))
 
+        except socket.error as error:
+            raise NetworkError('socket.error: {0!r}'.format(error))
+
     return decorator
 
 
