Merge branch 'ss/import-errno' into next

Conflicts: offlineimap/imapserver.py
2011-08-15 14:46:52 +02:00 · 2011-08-15 14:46:52 +02:00 · 82bf23ee57
commit 82bf23ee57
parent 2749374a93 4a0d17b566
1 changed files with 1 additions and 0 deletions
--- a/offlineimap/imapserver.py
+++ b/offlineimap/imapserver.py
@ -25,6 +25,7 @@ import hmac
 import socket
 import base64
 import time
+import errno

 from socket import gaierror
 try: