Merge branch 'ss/import-errno' into next

Conflicts:
	offlineimap/imapserver.py
This commit is contained in:
Nicolas Sebrecht 2011-08-15 14:46:52 +02:00
commit 82bf23ee57

View File

@ -25,6 +25,7 @@ import hmac
import socket import socket
import base64 import base64
import time import time
import errno
from socket import gaierror from socket import gaierror
try: try: