[evolution-kolab/ek-wip-porting: 3/3] Merge branch 'ek-wip-porting-imapx' into ek-wip-porting

[Christian Hilberg <chilberg src gnome org>]

commit af6cc73caaa3520fc2d0e2836d541223b2f33364
Merge: 0335fff affd0d4
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Dec 19 20:01:49 2011 +0100

    Merge branch 'ek-wip-porting-imapx' into ek-wip-porting

 src/camel/providers/imapx/camel-imapx-server.c |  562 ++++++++++++++----------
 src/camel/providers/imapx/camel-imapx-server.h |    4 +-
 2 files changed, 326 insertions(+), 240 deletions(-)
---