8c730cf509
Conflicts: offlineimap/folder/IMAP.py Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
Conflicts: offlineimap/folder/IMAP.py Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>