Merge branch 'imap' of https://github.com/bnoordhuis/curl into bnoordhuis-imap
authorDaniel Stenberg <daniel@haxx.se>
Sat, 12 Mar 2011 23:36:38 +0000 (00:36 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Sat, 12 Mar 2011 23:36:38 +0000 (00:36 +0100)

Trivial merge