Nicolas Sebrecht ee8a00cce2 Merge branch 'ss/ui' into next
Conflicts:
	offlineimap/folder/IMAP.py

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-01-05 19:31:08 +01:00
..
2008-01-03 04:56:55 +01:00
2011-01-05 19:31:08 +01:00
2006-08-22 02:09:36 +01:00