Nicolas Sebrecht 7b8d7501d1 Merge branch 'master' into next
Conflicts:
	Changelog.draft.rst
	offlineimap/imapserver.py
2011-03-07 21:55:43 +01:00
..
2011-02-21 12:26:48 +01:00
2011-03-07 21:55:43 +01:00
2011-03-07 21:55:43 +01:00
2011-03-03 18:23:32 +01:00
2006-08-12 05:15:55 +01:00
2006-08-12 05:15:55 +01:00
2011-01-14 19:25:11 +01:00
2011-01-25 19:19:14 +01:00