]> code.delx.au - offlineimap/commitdiff
Merge commit 'origin' into v7
authorJohn Goerzen <jgoerzen@complete.org>
Mon, 29 Sep 2008 23:07:45 +0000 (18:07 -0500)
committerJohn Goerzen <jgoerzen@complete.org>
Mon, 29 Sep 2008 23:07:45 +0000 (18:07 -0500)

Trivial merge