From: martin f. krafft <madduck@madduck.net>
Date: Sun, 1 Mar 2009 17:37:38 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/offlineimap
X-Git-Url: https://git.madduck.net/etc/offlineimap.git/commitdiff_plain/d9501643faeb73ab6a7811fe4c87d4de34e1e8c4?hp=-c

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/offlineimap

Conflicts:
	.offlineimap/helper.py
---

d9501643faeb73ab6a7811fe4c87d4de34e1e8c4